Christoph Oelckers 14a6e7989b Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # wadsrc/static/menudef.txt		2016-10-10 11:38:08 +02:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2016-10-10 11:38:08 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00