qzdoom/wadsrc
Randy Heit 4deeb8d8ae Merge branch 'master' into scripting
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/p_local.h
	src/p_map.cpp
	src/sdl/i_main.cpp
	src/thingdef/thingdef_codeptr.cpp
2013-06-25 19:28:25 -05:00
..
static Merge branch 'master' into scripting 2013-06-25 19:28:25 -05:00
CMakeLists.txt - More Visual Studio with CMake fixes. 2013-03-08 19:23:06 +00:00
wadsrc.vcproj - removed obsolete references to 'generated' directory from Wadsrc project. 2011-01-09 13:49:54 +00:00