Merge branch 'master' into fruitiex/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 21:38:22 +0000 (22:38 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 21:38:22 +0000 (22:38 +0100)
commitcdf4fd224cc017619bae2b01f07a5c5dff74af18
treea91cdf1cdbd1edcbb77b3150ef9ecf92ba85ca01
parent3e97fbf0ff42628304093a88ea40c423bed640c2
parent383994006134bdf60a9668f4ad6c685798afcf7c
Merge branch 'master' into fruitiex/fruitbalance
balance25.cfg
balanceTest.cfg
defaultXonotic.cfg