From: Rudolf Polzer Date: Sun, 16 May 2010 18:53:02 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/diabolik/weaponscale' X-Git-Tag: xonotic-v0.1.0preview~605 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5174b0f43d421554519d485b94893249cb095963;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/diabolik/weaponscale' --- 5174b0f43d421554519d485b94893249cb095963