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)
1  2 
defaultXonotic.cfg

Simple merge