Christoph Oelckers 3e318e4555 Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: .gitignore src/CMakeLists.txt		2014-02-16 21:08:44 +01:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2014-02-16 21:08:44 +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