Christoph Oelckers 3b823fa3eb Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # wadsrc/static/compatibility.txt		2016-12-22 11:29:44 +01:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2016-12-22 11:29:44 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00