Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:39:34 +0000 (15:39 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:39:34 +0000 (15:39 +0100)
1  2 
defaultXonotic.cfg

Simple merge