Christoph Oelckers 065c0a79cd Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting ... Conflicts: src/d_main.cpp src/info.cpp src/info.h src/p_acs.cpp src/p_interaction.cpp src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp src/thingdef/thingdef_properties.cpp (scripting branch update part 5)		2015-04-28 12:48:33 +02:00
..
static	Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting	2015-04-28 12:48:33 +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