Christoph Oelckers 15d5a5256f Merge branch 'master' of ZDoom ... # Conflicts: # .gitignore # src/win32/i_system.cpp		2016-02-09 14:41:31 +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	Update VS2005 projects for re2c and zdoom	2016-02-08 21:27:02 -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