Christoph Oelckers 11e613f578 Merge branch 'master' into floatcvt ... # Conflicts: # src/g_doom/a_revenant.cpp		2016-03-21 01:28:50 +01:00
..
parse_xlat.cpp	Normalize line endings	2016-03-01 09:47:10 -06:00
xlat.h	Normalize line endings	2016-03-01 09:47:10 -06:00
xlat_parser.y	Merge branch 'master' into floatcvt	2016-03-21 01:28:50 +01:00