Merge branch 'master' into server

5e3edeac · nanahira · 0d0a6367 · c2797e98 · 023f2633 · 5e3edeac
Commit 5e3edeac authored Apr 03, 2019 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

script script +1 -1

system.conf system.conf +1 -1

No files found.
--- a/script @ 023f2633
+++ b/script @ 023f2633
-Subproject commit 68a3de27cbd22e6cf74157feeaa2b8e5ee455636
+Subproject commit 023f2633af95d9116c770e424c661a1ca171ea94
--- a/system.conf
+++ b/system.conf
@@ -2,7 +2,7 @@
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
 use_image_scale = 1
-pro_version = 4936
+pro_version = 4937
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi