Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/forced-teams-by...
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 06:52:16 +0000 (07:52 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 12 Nov 2010 06:52:16 +0000 (07:52 +0100)
1  2 
balanceXonotic.cfg

Simple merge