Merge branch 'master' of github.com:SupSuper/OpenXcom

Conflicts:
	src/OpenXcom.2010.vcxproj.user

Author: Shoes01

.gitignore

@@ -62,17 +62,28 @@ _ReSharper.*/
 *.tmp
 *.dgml
 #OpenXcom stuff (no ending slashes for dirs so symlinks can be ignored as well as real dirs)
-bin/data/GEODATA
-bin/data/GEOGRAPH
-bin/data/MAPS
-bin/data/ROUTES
-bin/data/SOUND
-bin/data/TERRAIN
-bin/data/UFOGRAPH
-bin/data/UFOINTRO
-bin/data/UNITS
-bin/data/ANIMS
-bin/data/FLOP_INT
+bin/UFO/GEODATA
+bin/UFO/GEOGRAPH
+bin/UFO/MAPS
+bin/UFO/ROUTES
+bin/UFO/SOUND
+bin/UFO/TERRAIN
+bin/UFO/UFOGRAPH
+bin/UFO/UFOINTRO
+bin/UFO/UNITS
+bin/TFTD/ANIMS
+bin/TFTD/FLOP_INT
+bin/TFTD/GEODATA
+bin/TFTD/GEOGRAPH
+bin/TFTD/MAPS
+bin/TFTD/MISSDAT
+bin/TFTD/ROUTES
+bin/TFTD/SOUND
+bin/TFTD/TERRAIN
+bin/TFTD/UFOGRAPH
+bin/TFTD/UNITS
+#Ignore TFTD ruleset for the time being
+bin/standard/xcom2/Xcom2Ruleset.rul
 deps/
 docs/html/
 build/

CMakeLists.txt

@@ -132,7 +132,7 @@ if ( BUILD_PACKAGE )
   set ( CPACK_PACKAGE_VENDOR "The OpenXcom project" )
   set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open-source clone of UFO: Enemy Unknown" )
   set ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/cmake/modules/Description.txt" )
-  set ( CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.txt" )
+  set ( CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md" )
   if ( NOT APPLE )
     set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt" )
   endif ()