Christoph Oelckers 2fd4fa9660 Merge branch 'master' of https://github.com/rheit/zdoom into zscript ... # Conflicts: # wadsrc/static/actors/doom/doomimp.txt		2016-10-20 10:44:53 +02:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom into zscript	2016-10-20 10:44:53 +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