Christoph Oelckers d8ea128f38 Merge branch 'master' into scripting ... Conflicts: src/p_effect.cpp src/p_effect.h src/p_local.h src/p_map.cpp src/thingdef/thingdef_codeptr.cpp		2015-07-16 20:37:17 +02:00
..
static	Merge branch 'master' into scripting	2015-07-16 20:37:17 +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