Christoph Oelckers 760db90d71 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # CMakeLists.txt		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
trustinfo.rc
trustinfo.txt
updaterevision.c
updaterevision.vcproj