Christoph Oelckers c39e962fd5 Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/CMakeLists.txt src/posix/sdl/hardware.cpp Please note that this will NOT(!!!) compile on Linux without adjusting sdlglvideo.cpp!		2014-12-25 22:50:15 +01:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2014-12-25 22:50:15 +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