Merge branch 'master' into diff

adf3215b · nanahira · 1dee92a8 · be900a23 · adf3215b · 550a8686
Commit adf3215b authored May 23, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

.gitignore .gitignore +1 -0

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,7 @@
 *.log
 /.vscode
 /bak/
+/output
 /temp
 [Tt]humbs.cdb


--- a/ocgcore @ 550a8686
+++ b/ocgcore @ 550a8686
-Subproject commit 1ee226c70499c6ed26282624608e31cea97cd398
+Subproject commit 550a8686cceaad525682c7737cf3def9d6efe648
--- a/script @ 7ee7119c
+++ b/script @ 7ee7119c
-Subproject commit af05e72bd515a5b45c679e4b05b42bd69a2ea6bb
+Subproject commit 7ee7119c5021ecc3b093e0ba49460e08de714d4f