Merge branch 'master' into server

74b406ad · nanahira · a984a428 · 649a3052 · bbf65a2d · 74b406ad
Commit 74b406ad authored Jan 24, 2020 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 @ bbf65a2d
+++ b/script @ bbf65a2d
-Subproject commit b820812a1ffb14eeb0022b2336c0c8c93d856d5c
+Subproject commit bbf65a2de82797b22380327c6f4b6a0250fce6c4
--- 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 = 4939
+pro_version = 4944
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi