Merge branch 'fruitiex/fruit_vs_tzork-balance' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Thu, 25 Nov 2010 21:31:29 +0000 (23:31 +0200)
committerFruitieX <fruitiex@gmail.com>
Thu, 25 Nov 2010 21:31:29 +0000 (23:31 +0200)
1  2 
balanceXonotic.cfg

Simple merge