Merge branch 'master' into server

da3b93d2 · nanahira · 30c914c9 · afde781a · da3b93d2
Commit da3b93d2 authored Apr 07, 2018 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

gframe/game.h gframe/game.h +0 -3

No files found.
--- a/gframe/game.h
+++ b/gframe/game.h
@@ -675,7 +675,6 @@ extern HostInfo game_info;
 #define BUTTON_MARKS_FILTER			380
 #define BUTTON_MARKERS_OK			381

-
 #define TEXTURE_DUEL				0
 #define TEXTURE_DECK				1
 #define TEXTURE_MENU				2
@@ -684,7 +683,5 @@ extern HostInfo game_info;
 #define TEXTURE_ATTACK				5
 #define TEXTURE_ACTIVATE			6

-
-
 #define DEFAULT_DUEL_RULE			4
 #endif // GAME_H