Christoph Oelckers d6e3fc0567 Merge commit 'fb9231a38db2025eb77bfd246f36d985cbbccd2e' into scripting ... Conflicts: src/info.cpp src/thingdef/thingdef_expression.cpp wadsrc/static/actors/constants.txt (Scripting branch update part 2)		2015-04-28 09:57:01 +02:00
..
static	Merge commit 'fb9231a38db2025eb77bfd246f36d985cbbccd2e' into scripting	2015-04-28 09:57:01 +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