Merge branch 'master' into another

ad78b023 · nanahira · f564081a · b2d72135 · ad78b023 · ad78b023
Commit ad78b023 authored Jun 05, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cards.cdb cards.cdb +0 -0

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

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

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

 namespace ygo {