Merge branch 'master' into server

456c2232 · nanahira · 54729333 · 509ab093 · c49edddf · 040b7a2b
Commit 456c2232 authored Sep 01, 2018 by nanahira
Hide 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 @ c49edddf
+++ b/ocgcore @ c49edddf
-Subproject commit bb6e5c5f8bf83f7fb1bc8ff2015a95b22fb2854c
+Subproject commit c49edddf8120e63a0bc87db1655cde568ab11588
--- a/script @ 040b7a2b
+++ b/script @ 040b7a2b
-Subproject commit 682d795eb0ff5ae931e5af912c7ce51c2d92d876
+Subproject commit 040b7a2bd002248718c23e5b5ba5526aab112bdb