Merge branch 'master' into another

5df67cd2 · nanahira · 1a6a5f54 · f84df486 · 5df67cd2 · cb1df0f6
Commit 5df67cd2 authored Oct 14, 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 @ cb1df0f6
+++ b/ocgcore @ cb1df0f6
-Subproject commit 0387699fc9a4895dfba6fc3eaab76e2d7b72ba1d
+Subproject commit cb1df0f695837cb5c69b33af962854191658b052
--- a/script @ ac7ac09c
+++ b/script @ ac7ac09c
-Subproject commit d4fdc1e6ffa84182bf5402eb1660c6469a51fa4e
+Subproject commit ac7ac09c188c4bbde6359ac89dc8d99f663f6c33