Christoph Oelckers 760db90d71 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # CMakeLists.txt		2016-02-06 05:21:48 +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	2016-02-06 05:21:48 +01:00
wadsrc.vcproj	- converted project to Visual Studio 2008 format.	2013-10-03 12:08:57 +02:00