Christoph Oelckers 251172c7f0 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt ... # Conflicts: # src/r_data/r_interpolate.cpp		2016-03-30 18:24:22 +02:00
..
static	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt	2016-03-30 18:24:22 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00