gzdoom/wadsrc
Christoph Oelckers 7ba577e1b0 Merge branch 'master' into scripting
Conflicts:
	src/g_heretic/a_hereticweaps.cpp
	src/thingdef/thingdef_codeptr.cpp
2015-06-07 09:43:54 +02:00
..
static Merge branch 'master' into scripting 2015-06-07 09:43:54 +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