Christoph Oelckers 70d87f94f2 Merge branch 'master' into floatcvt ... # Conflicts: # src/p_acs.cpp # src/r_utility.cpp # src/thingdef/thingdef_codeptr.cpp # src/version.h		2016-03-23 14:15:24 +01:00
..
static	Merge branch 'master' into floatcvt	2016-03-23 14:15:24 +01:00
CMakeLists.txt	- Bump CMake version requirement to 2.8.7. This means that generator expressions must be supported as well as empty else and endif expressions (like most sane languages). ZDoom probably didn't work with 2.4 anymore anyway.	2016-02-05 21:19:29 -05:00