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