Christoph Oelckers e846d06a9f Merge remote-tracking branch 'remotes/zdoom/master' ... Conflicts: src/posix/sdl/hardware.cpp		2015-02-07 14:29:31 +01:00
..
static	Merge remote-tracking branch 'remotes/zdoom/master'	2015-02-07 14:29:31 +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