Christoph Oelckers f940216c17 Merge branch 'master' into zscript ... # Conflicts: # src/p_actionfunctions.cpp # wadsrc/static/actors/actor.txt		2016-11-02 11:08:51 +01:00
..
static	Merge branch 'master' into zscript	2016-11-02 11:08:51 +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