Merge branch 'master' into minmax

2014-01-24 23:49:30 +01:00
parent 746a486e7a 30d92eb68c
commit 541698f98e
100 changed files with 5124 additions and 1688 deletions
--- a/projects/mtg/src/StoryFlow.cpp
+++ b/projects/mtg/src/StoryFlow.cpp
@@ -13,6 +13,7 @@
 #include "PlayerData.h"
 #include "MTGDeck.h"
 #include "WFont.h"
+#include "GameApp.h"
 #include <JFileSystem.h>

 #define LINE_SPACE 2