Merge branch 'master' into another

71bc65e1 · nanahira · 23b4012a · 42ccc802 · 71bc65e1 · a27637a8
Commit 71bc65e1 authored Dec 15, 2019 by nanahira
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 192 additions and 17 deletions

lflist.conf lflist.conf +190 -14

ocgcore ocgcore +1 -1

premake4.lua premake4.lua +0 -1

script script +1 -1

No files found.
--- a/lflist.conf
+++ b/lflist.conf
--- a/ocgcore @ a27637a8
+++ b/ocgcore @ a27637a8
-Subproject commit 07f666057a689d70dda3b1da4e80fff1d5fbd098
+Subproject commit a27637a88d49538df889f6f9e178536b14725daa
--- a/premake4.lua
+++ b/premake4.lua
@@ -2,7 +2,6 @@ solution "ygo"
    location "build"
    language "C++"
    objdir "obj"
-    startproject "ygopro"
    configurations { "Release", "Debug" }
    defines { "LUA_COMPAT_5_2" }

--- a/script @ bd3b671c
+++ b/script @ bd3b671c
-Subproject commit d9777969962a8340acfa6d5151fc5ab4f56abf87
+Subproject commit bd3b671c2a5e8314dcf18b4907cf44da82418339