Christoph Oelckers 6b02ea9871 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # CMakeLists.txt		2016-09-24 09:28:09 +02:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2016-09-24 09:28:09 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00