Merge branch 'master' into another

578d3bd0 · nanahira · a6ded32c · c30c2b57 · 578d3bd0 · 75b1e187
Commit 578d3bd0 authored Aug 06, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cards.cdb cards.cdb +0 -0

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/ocgcore @ 75b1e187
+++ b/ocgcore @ 75b1e187
-Subproject commit 6358a6f7080f1a88d841d44fe2b5de545c88b712
+Subproject commit 75b1e18736f4d8ae0cc71494c8f36a6257fc3b1a
--- a/script @ 4b274040
+++ b/script @ 4b274040
-Subproject commit 0b6cb7fe6997d151c80ebeb944c81da768cde6b9
+Subproject commit 4b274040090fc6010522446d5e2136095c82a7c7