qzdoom/wadsrc
Christoph Oelckers 5207aa6cc0 Merge commit '125afcf3defb901e23bd44d32fa86681ef1748f6' into scripting
Conflicts:
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/shared/inventory.txt
2016-01-17 19:09:05 +01:00
..
static Merge commit '125afcf3defb901e23bd44d32fa86681ef1748f6' into scripting 2016-01-17 19:09:05 +01: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