From: Rudolf Polzer Date: Fri, 3 Dec 2010 07:28:04 +0000 (+0100) Subject: Merge remote branch 'origin/diabolik/glow_erebus_screenie' X-Git-Tag: xonotic-v0.1.0preview~78 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed52337e1e4aeb2f639e0d2c46273c8a06b1cc13;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/diabolik/glow_erebus_screenie' --- ed52337e1e4aeb2f639e0d2c46273c8a06b1cc13