Christoph Oelckers f7834061df Merge commit 'b6a4511dd1e74440fad99bc673c1f2b3680dba48' into scripting ... Conflicts: src/dobjtype.cpp src/p_conversation.cpp src/p_local.h src/p_things.cpp src/thingdef/thingdef_properties.cpp (This is just the conversationID to MAPINFO stuff to keep the conflicts as small as possible)		2015-04-28 13:08:18 +02:00
..
static	Merge commit 'b6a4511dd1e74440fad99bc673c1f2b3680dba48' into scripting	2015-04-28 13:08:18 +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