Merge branch 'master' into wp8

Conflicts: JGE/src/Qtmain.cpp
2013-11-29 22:31:20 +01:00
parent 9a493e4af4 4095676b6b
commit f550784973
55 changed files with 386 additions and 333 deletions
@@ -49,6 +49,8 @@ android:INCLUDEPATH += $$ANDROID_NDK_ROOT/platforms/android-9/arch-arm/usr/inclu
 #DEFINES += QT_NO_DEBUG_OUTPUT
 DEFINES += NETWORK_SUPPORT

+DEFINES += TIXML_USE_STL
+
 windows:INCLUDEPATH += ../../JGE/Dependencies/include
 windows{
    *-g++* {