From: Rudolf Polzer Date: Sun, 21 Aug 2011 18:34:29 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/terencehill/infinite_ammo' X-Git-Tag: xonotic-v0.5.0~95 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=5bad3c7afd764ecf5957604854c83cc5ee5a6f30;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/terencehill/infinite_ammo' --- 5bad3c7afd764ecf5957604854c83cc5ee5a6f30