Christoph Oelckers 251cdacf26 Merge branch 'master' into scripting ... Conflicts: src/g_shared/a_randomspawner.cpp src/g_strife/a_strifeweapons.cpp src/thingdef/thingdef_parse.cpp wadsrc/static/actors/constants.txt		2013-09-03 09:01:28 +02:00
..
static	Merge branch 'master' into scripting	2013-09-03 09:01: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