Christoph Oelckers 5c267a2169 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # wadsrc/static/language.eng		2016-08-21 08:42:06 +02:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2016-08-21 08:42:06 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00