From: Rudolf Polzer Date: Tue, 6 Mar 2012 09:23:45 +0000 (+0100) Subject: Merge branch 'master' into divVerent/weapons-field-rewrite X-Git-Tag: xonotic-v0.7.0~348^2~1^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=54ef76df460d8ec00e5058372b383561e11d04b9;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/weapons-field-rewrite --- 54ef76df460d8ec00e5058372b383561e11d04b9