Randy Heit c63f65d441 Merge remote-tracking branch 'origin/master' into scripting ... Conflicts: src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/constants.txt		2016-01-22 20:53:27 -06:00
..
static	Merge remote-tracking branch 'origin/master' into scripting	2016-01-22 20:53:27 -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