Merge remote branch 'origin/mand1nga/bots/weapons-fixes'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 19:59:48 +0000 (20:59 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 19:59:48 +0000 (20:59 +0100)
commit57c5dfd12fc3f7ce7b2bc844325a2c85929f10de
tree71f2bde1cd53689c447d5d08fd023bbb3d5a7c0a
parent997cb76a518f8a50c1cfa41e3f7b3d1489b38937
parente32db45cc6feb802c48cc8bc4f09ab3a780061c3
Merge remote branch 'origin/mand1nga/bots/weapons-fixes'
defaultXonotic.cfg