Christoph Oelckers 6bfbe30b99 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/CMakeLists.txt # src/g_level.cpp # src/p_saveg.cpp # src/r_defs.h # src/version.h (note that this commit will not compile!)		2016-09-24 00:40:15 +02:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2016-09-24 00:40:15 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00