Christoph Oelckers bf747075e8 Merge branch 'master' into scripting ... Conflicts: src/actor.h src/g_hexen/a_clericstaff.cpp src/p_enemy.cpp src/p_interaction.cpp src/p_local.h src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp		2016-01-17 20:57:55 +01:00
..
static	Merge branch 'master' into scripting	2016-01-17 20:57:55 +01: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