Christoph Oelckers 0f19356e24 Merge branch 'master' of https://github.com/MajorCooke/zdoom ... Conflicts: wadsrc/static/actors/constants.txt		2014-10-12 08:43:46 +02:00
..
static	Merge branch 'master' of https://github.com/MajorCooke/zdoom	2014-10-12 08:43:46 +02:00
CMakeLists.txt	- Allow generator expressions to be turned off during pk3 building with CMake.	2013-07-01 16:57:46 -04:00
wadsrc.vcproj	- removed obsolete references to 'generated' directory from Wadsrc project.	2011-01-09 13:49:54 +00:00