Merge branch 'master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 14 Jul 2010 18:16:22 +0000 (21:16 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 14 Jul 2010 18:16:22 +0000 (21:16 +0300)
commit4e6d5b02ec3b69aa98c30e5e4d2a0816dd1c8f15
tree1d890658c3c07fcf652f84061a0ff04542cd6ac6
parent5fca782f85c8971b23b76e610183dd273d4381b2
parentf66615b722a8527aecfa7a6f2a74bb55204fb16b
Merge branch 'master' into fruitiex/fruitbalance
defaultXonotic.cfg