Merge branch 'master' into another

c306fa00 · nanahira · e8e3c5f6 · 948e45a9 · c306fa00 · c306fa00
Commit c306fa00 authored Jun 10, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

.gitignore .gitignore +1 -0

cards.cdb cards.cdb +0 -0

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -77,6 +77,7 @@
 /.vscode
 /bak/
 /output
+/replace.sh
 /temp
 [Tt]humbs.cdb

--- a/cards.cdb
+++ b/cards.cdb
--- a/ocgcore @ 7acb5b8d
+++ b/ocgcore @ 7acb5b8d
-Subproject commit 9fb43bf0ef49641ba985b7b7a6666221acf5cf1e
+Subproject commit 7acb5b8d9620dfcec7f12c3a59adffe6c355773b
--- a/script @ 77fcba93
+++ b/script @ 77fcba93
-Subproject commit 77b486a913a2552af9e74ec69189b66930bfbaac
+Subproject commit 77fcba93ca1be1aff287eace401caa6cef231740