Christoph Oelckers 9144efe8bc Merge remote-tracking branch 'remotes/zdoom/maint' into maint2.1 ... # Conflicts: # src/version.h		2016-02-23 10:19:47 +01:00
..
static	Merge remote-tracking branch 'remotes/zdoom/maint' into maint2.1	2016-02-23 10:19:47 +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