Merge branch 'master' into server

d8518547 · nanahira · 95820e10 · 15c8a56b · d8518547 · cd3ed6ff
Commit d8518547 authored Oct 21, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

ocgcore ocgcore +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 = 0x1345;
+unsigned short PRO_VERSION = 0x1346;
 namespace ygo {

--- a/ocgcore @ cd3ed6ff
+++ b/ocgcore @ cd3ed6ff
-Subproject commit e40ffb2fc6433d12e384858c755265014077fcec
+Subproject commit cd3ed6ffc92c1f4e45b69ddd1f0d1c307730bd0b