From: Matthias Krüger Date: Mon, 31 Aug 2015 15:56:09 +0000 (+0200) Subject: Merge branch 'master' into matthiaskrgr/srgb X-Git-Tag: xonotic-v0.8.2~181^2^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5de00aed30cd8774e9951f883193675099deb42f;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into matthiaskrgr/srgb --- 5de00aed30cd8774e9951f883193675099deb42f