From: Matthias Krüger Date: Fri, 28 Aug 2015 16:44:51 +0000 (+0200) Subject: Merge branch 'master' into matthiaskrgr/srgb X-Git-Tag: xonotic-v0.8.2~181^2~28 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=900ea1cd36976b5b5f539d5ee65c742aeeedca05;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into matthiaskrgr/srgb --- 900ea1cd36976b5b5f539d5ee65c742aeeedca05