Major Cooke ff3487d389 Merge branch 'OverlayAlpha' into OverlayExtension9 ... # Conflicts: # src/p_pspr.cpp # src/r_draw.cpp # wadsrc/static/actors/actor.txt # wadsrc/static/actors/constants.txt		2016-12-26 14:37:22 -06:00
..
static	Merge branch 'OverlayAlpha' into OverlayExtension9	2016-12-26 14:37:22 -06: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