From: Rudolf Polzer Date: Thu, 9 Dec 2010 19:59:48 +0000 (+0100) Subject: Merge remote branch 'origin/mand1nga/bots/weapons-fixes' X-Git-Tag: xonotic-v0.1.0preview~65 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=57c5dfd12fc3f7ce7b2bc844325a2c85929f10de;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/mand1nga/bots/weapons-fixes' --- 57c5dfd12fc3f7ce7b2bc844325a2c85929f10de