Christoph Oelckers 48afdd7dcb Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt ... # Conflicts: # src/CMakeLists.txt # src/actor.h		2016-03-21 01:34:39 +01:00
..
static	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt	2016-03-21 01:34:39 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00