Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 14 Jul 2010 18:16:22 +0000 (21:16 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 14 Jul 2010 18:16:22 +0000 (21:16 +0300)
1  2 
defaultXonotic.cfg

Simple merge