Christoph Oelckers e3c06e3df7 Merge commit '165d26baa1569685651baf4575e12e73c8cbfd2e' ... # Conflicts: # bzip2/bzip2.vcproj # game-music-emu/game-music-emu.vcproj # gdtoa/gdtoa.vcproj # jpeg-6b/jpeg-6b.vcproj # src/p_spec.cpp # src/r_defs.h # tools/fixrtext/fixrtext.vcproj # tools/lemon/lemon.vcproj # tools/updaterevision/updaterevision.vcproj # tools/zipdir/zipdir.vcproj # wadsrc/static/xlat/eternity.txt # wadsrc/wadsrc.vcproj # zlib/zlib.vcproj		2016-03-01 17:23:35 +01:00
..
static	Merge commit '165d26baa1569685651baf4575e12e73c8cbfd2e'	2016-03-01 17:23:35 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00