From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 19 May 2010 13:44:52 +0000 (+0200)
Subject: Merge remote branch 'origin/diabolik/weaponscale'
X-Git-Tag: xonotic-v0.1.0preview~573^3~7^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bcaac9fd4eb317429d3d4d1fb97193757349334a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/diabolik/weaponscale'
---

bcaac9fd4eb317429d3d4d1fb97193757349334a