Christoph Oelckers 2e0f999fea Merge branch 'master' into scripting ... Conflicts: src/p_effect.cpp src/p_effect.h src/p_local.h src/p_map.cpp src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/actor.txt wadsrc/static/actors/shared/inventory.txt zdoom.vcproj		2015-04-28 14:45:13 +02:00
..
static	Merge branch 'master' into scripting	2015-04-28 14:45:13 +02:00
CMakeLists.txt	…
wadsrc.vcproj	…