Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:06:45 +0000 (14:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:06:45 +0000 (14:06 +0100)
1  2 
balanceXonotic.cfg

Simple merge