Christoph Oelckers ddced06be2 Merge commit '6e45c565a0' into scripting ... Conflicts: src/p_mobj.cpp (This stops right before moving the conversation IDs into MAPINFO because that feature is quite conflict-heavy and will have to merged by itself.)		2015-04-28 12:59:20 +02:00
..
static	Merge commit '6e45c565a0' into scripting	2015-04-28 12:59:20 +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