Merge branch 'fruitiex/fruit_vs_tzork-balance' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Thu, 25 Nov 2010 21:31:29 +0000 (23:31 +0200)
committerFruitieX <fruitiex@gmail.com>
Thu, 25 Nov 2010 21:31:29 +0000 (23:31 +0200)
commit180cb09570fa9bc40e8747b7ef05dfbe710aff83
treeb61dc75a7c1725608e56fd2f0c6d569432360674
parentfd5886b4935bc9bcec2c48615209621d3b2fc8dc
parent7afe3ead3923d876fddb222e3b3830c0d6929c3c
Merge branch 'fruitiex/fruit_vs_tzork-balance' into fruitiex/balance
balanceXonotic.cfg