Randy Heit 9744b9e0d9 Merge branch 'master' into scripting ... Conflicts: src/actor.h src/dobject.h src/dobjgc.cpp src/p_local.h src/thingdef/thingdef_codeptr.cpp		2016-01-21 12:45:06 -06:00
..
static	Merge branch 'master' into scripting	2016-01-21 12:45:06 -06: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