From: Rudolf Polzer Date: Sun, 16 May 2010 19:05:11 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/diabolik/weaponscalesource' X-Git-Tag: xonotic-v0.1.0preview~58 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=36ae563f0141643bdba1797816d4090cc5fa5aab Merge remote branch 'refs/remotes/origin/diabolik/weaponscalesource' --- 36ae563f0141643bdba1797816d4090cc5fa5aab