Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:39:34 +0000 (15:39 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:39:34 +0000 (15:39 +0100)
commitc61fbd6b1967309d22daf08336a7bb87d01cb476
treea1a4afc8087de19b74616a9776320366d53b2e4a
parentb6209a405f1db69cffe116b09555e054d99c3a07
parentfeb6974bd5e09f580ec6707ae8159fdf587c85af
Merge remote branch 'origin/fruitiex/fruitbalance'
defaultXonotic.cfg