Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server

25c12f4b · mercury233 · 00c6cbe5 · 83ad6221 · 25c12f4b · 60d8b81d
Commit 25c12f4b authored Nov 18, 2018 by mercury233
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -16,7 +16,7 @@
 #include "single_mode.h"
 #endif //YGOPRO_SERVER_MODE

-const unsigned short PRO_VERSION = 0x1346;
+const unsigned short PRO_VERSION = 0x1347;

 namespace ygo {


--- a/ocgcore @ 60d8b81d
+++ b/ocgcore @ 60d8b81d
-Subproject commit b7ef043dc86e2c5f81f4370ed9a6be6212d7e18c
+Subproject commit 60d8b81d6d89c62e9d40d8bb8f6504f45121b053
--- a/script @ 87b2a039
+++ b/script @ 87b2a039
-Subproject commit 70d943154a16c35f82aba9ca4a94a47cb3a1e140
+Subproject commit 87b2a039e3b02c8fad75aa53719095e60c866466