From: Rudolf Polzer Date: Fri, 25 Nov 2011 11:20:29 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/mirceakitsune/bloom_tweaks' X-Git-Tag: xonotic-v0.6.0~35^2~33^2~23 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=051873e704f3a26294c1257722b2cc0dc7244c15;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/mirceakitsune/bloom_tweaks' --- 051873e704f3a26294c1257722b2cc0dc7244c15