Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 06:57:24 +0000 (07:57 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 06:57:24 +0000 (07:57 +0100)
1  2 
balanceXonotic.cfg

Simple merge