Christoph Oelckers bba092cc0b Merge branch 'master' into scripting ... Conflicts: src/d_player.h src/g_doom/a_archvile.cpp src/thingdef/thingdef.h src/thingdef/thingdef_properties.cpp		2013-08-09 13:03:28 +02:00
..
static	Merge branch 'master' into scripting	2013-08-09 13:03:28 +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