Christoph Oelckers 56989d3422 Merge commit 'ec5817869592660af6837b9f4e20ed140972a2b2' into scripting ... Conflicts: src/p_enemy.cpp src/p_enemy.h wadsrc/static/actors/constants.txt (Scripting branch update part 1)		2015-04-28 09:34:51 +02:00
..
static	Merge commit 'ec5817869592660af6837b9f4e20ed140972a2b2' into scripting	2015-04-28 09:34:51 +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