Christoph Oelckers 0678a469de Merge remote-tracking branch 'remotes/zdoom/master' ... # Conflicts: # src/win32/i_system.cpp # tools/re2c/re2c.vcproj		2016-02-08 21:47:19 +01:00
..
fixrtext	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00
lemon	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00
re2c	Fix VC++'s problems with re2c 0.16	2016-02-06 21:19:05 -06:00
updaterevision	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00
zipdir	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +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