Christoph Oelckers f8e5a0ebf0 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/g_doomedmap.cpp # src/info.h # src/p_saveg.cpp # src/p_setup.cpp # src/p_spec.cpp # src/r_defs.h # wadsrc/static/mapinfo/eternity.txt # wadsrc/static/xlat/eternity.txt		2016-02-06 00:41:00 +01:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 00:41:00 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2013-07-02 09:59:59 +02:00
wadsrc.vcproj	- converted project to Visual Studio 2008 format.	2013-10-03 12:08:57 +02:00