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

c02ad0ff · mercury233 · 5b95c2ed · e64a666e · 909d844e · 8223ac0d
Commit c02ad0ff authored Oct 02, 2015 by mercury233
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/ocgcore @ 909d844e
+++ b/ocgcore @ 909d844e
-Subproject commit 3ee632012beb0a3cb1270134d9f77ba815e08e76
+Subproject commit 909d844e4a36fda3699e79fc030c9216c0ba6d2b
--- a/script @ 8223ac0d
+++ b/script @ 8223ac0d
-Subproject commit 4027b4521f1e749265e9b57ea14c51788a052cdc
+Subproject commit 8223ac0d56574d27c10bd6a128f0bef0417cdf32