Merge branch 'master' into 2pick

7b31f29a · nanahira · 38fa6b64 · 882343bf · 7b31f29a · 7b31f29a
Commit 7b31f29a authored Dec 21, 2017 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

cards.cdb cards.cdb +0 -0

premake4.lua premake4.lua +1 -2

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/premake4.lua
+++ b/premake4.lua
@@ -2,7 +2,6 @@ solution "ygo"
    location "build"
    language "C++"
    objdir "obj"
-	startproject "ygopro"

    configurations { "Debug", "Release" }
 	 defines { "LUA_COMPAT_5_2" }