Christoph Oelckers 0bcbacea53 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/posix/sdl/hardware.cpp		2016-03-04 01:21:59 +01:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2016-03-04 01:21:59 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00