Major Cooke 4865e7109c Fixed merge conflicts.		2016-10-02 21:18:01 -05:00
..
static	Fixed merge conflicts.	2016-10-02 21:18:01 -05: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