From: Rudolf Polzer Date: Tue, 18 May 2010 19:00:24 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/diabolik/weaponscale' X-Git-Tag: xonotic-v0.1.0preview~599 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5161f70e40526b9a7f1ed8415e391664be6bc39b;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/diabolik/weaponscale' --- 5161f70e40526b9a7f1ed8415e391664be6bc39b