Merge remote-tracking branch 'origin/master' into PerfectSoundForRelease

# Conflicts: # resources/Schema/Entities/CP_Rocky2.xml
2016-03-14 01:51:51 +01:00
parent 54a03ddc0f d492b54687
commit 8cef422ea7
8 changed files with 887 additions and 470 deletions
@@ -55,6 +55,7 @@ target_link_libraries(Game

 add_executable(TacticalZ
 	main.cpp
+    ${CMAKE_SOURCE_DIR}/resources/TacticalZ.rc
 )
 target_link_libraries(TacticalZ
    Game