Merge remote-tracking branch 'origin/master'

2013-08-31 14:24:06 +02:00
parent 36fef0be7f 9295a4be19
commit 2d5c68835d
104 changed files with 3391 additions and 17541 deletions
@@ -40,7 +40,10 @@
 #include "game_defs.h"

 #include <string>
+
+#ifndef Q_MOC_RUN
 #include <boost/shared_ptr.hpp>
+#endif

 #include <QtGui>
 #include <QtCore>
@@ -35,7 +35,9 @@

 #include <QtGui>
 #include <QtCore>
+#ifndef Q_MOC_RUN
 #include <third_party/boost/timers.hpp>
+#endif
 #if QT_VERSION >= 0x050000
 	#include <QtWidgets>
 #endif
@@ -37,7 +37,9 @@
 #if QT_VERSION >= 0x050000
 	#include <QtWidgets>
 #endif
+#ifndef Q_MOC_RUN
 #include <third_party/boost/timers.hpp>
+#endif
 #include "game_defs.h"

 /**