Merge remote-tracking branch 'refs/remotes/WagicProject/master'

This commit is contained in:
Anthony Calosa
2017-02-04 20:47:05 +08:00
+3
View File
@@ -8,6 +8,9 @@
#include "Rules.h" #include "Rules.h"
#include "GameObserver.h" #include "GameObserver.h"
#include "GameStateShop.h" #include "GameStateShop.h"
#ifdef QT_CONFIG
#include <QThread>
#endif
using std::string; using std::string;