Merge branch 'master' into server

7dedee5d · nanahira · cba38bb0 · ac007d04 · 7dedee5d · 0df217c8
Commit 7dedee5d authored Aug 16, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

gframe/game.cpp gframe/game.cpp +1 -1

ocgcore ocgcore +1 -1

script script +1 -1

system.conf system.conf +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -27,7 +27,7 @@
 #include <io.h>
 #endif

-unsigned short PRO_VERSION = 0x1344;
+unsigned short PRO_VERSION = 0x1345;

 namespace ygo {


--- a/ocgcore @ 0df217c8
+++ b/ocgcore @ 0df217c8
-Subproject commit e0280ee58c2cde057eaac083b25f3e3c4d39d2cd
+Subproject commit 0df217c8e5ff2d33bb651c550712e186c53d227a
--- a/script @ fa9a0e7b
+++ b/script @ fa9a0e7b
-Subproject commit 8cee6944a9e4c65a5e1ef81b1af835c2010aea31
+Subproject commit fa9a0e7ba5c6eb54a0c330bf90f83e90a6d187b0
--- 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 = 4931
+pro_version = 4933
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi