Christoph Oelckers 609defe078 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt ... # Conflicts: # src/r_defs.h		2016-03-24 12:48:05 +01:00
..
static	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt	2016-03-24 12:48:05 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00