Merge branch 'master' of https://github.com/WagicProject/wagic into wp8

Fixe timer in Qt frontend Fixe ExtraCost compilation (uses boost when not on WP8).
2013-11-17 18:33:52 +01:00
parent a6ba983650 0ef92d154a
commit 2c2edad8e5
20 changed files with 410 additions and 271 deletions
@@ -324,8 +324,8 @@ SOURCES += \
        ../../JGE/src/JParticleSystem.cpp\
        ../../JGE/src/JResourceManager.cpp\
        ../../JGE/src/JSpline.cpp\
-        ../../JGE/src/pc/JSocket.cpp\
        ../../JGE/src/pc/JSfx.cpp\
+        ../../JGE/src/pc/JSocket.cpp\
        ../../JGE/src/JNetwork.cpp\
        ../../JGE/src/JSprite.cpp\
        ../../JGE/src/Vector2D.cpp\