Christoph Oelckers d58d38a1d3 Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/p_3dfloors.cpp		2015-07-13 21:36:19 +02:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2015-07-13 21:36:19 +02: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