From: Rudolf Polzer Date: Mon, 2 Apr 2012 06:49:53 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/divVerent/weapons-field-rewrite' X-Git-Tag: xonotic-v0.7.0~240^2~99^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=14401d27dcc6eeb85c80331c242dcbb3e1d977d7;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/divVerent/weapons-field-rewrite' --- 14401d27dcc6eeb85c80331c242dcbb3e1d977d7