From: Rudolf Polzer Date: Mon, 5 Mar 2012 13:03:30 +0000 (+0100) Subject: Merge branch 'master' into divVerent/weapons-field-rewrite X-Git-Tag: xonotic-v0.7.0~348^2~1^2~10 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cda282ab36a796aa36ef671f87ef7fe00ce82c5e;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/weapons-field-rewrite --- cda282ab36a796aa36ef671f87ef7fe00ce82c5e