Merge branch 'master' of ../ygopro-7210srv

1c3047a8 · nanahira · 6fe1b953 · 89f50856 · 1c3047a8 · 1c3047a8
Commit 1c3047a8 authored Dec 18, 2017 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cards.cdb cards.cdb +0 -0

gframe/premake4.lua gframe/premake4.lua +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/gframe/premake4.lua
+++ b/gframe/premake4.lua
-include "lzma"
+include "lzma/."
 project "ygopro"
    kind "ConsoleApp"