Christoph Oelckers 2914cdc939 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/r_defs.h		2016-04-24 12:19:07 +02:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2016-04-24 12:19:07 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00