Magnus Norddahl 3369a2747c Merge remote-tracking branch 'upstream/master' into truecolor ... # Conflicts: # src/r_things.cpp		2016-06-17 08:23:42 +02:00
..
static	Merge remote-tracking branch 'upstream/master' into truecolor	2016-06-17 08:23:42 +02: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