Christoph Oelckers 57667c2e0b Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # wadsrc/static/language.eng		2016-06-29 14:58:32 +02:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2016-06-29 14:58:32 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00