Merge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir...
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 21 Jul 2010 11:15:20 +0000 (14:15 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 21 Jul 2010 11:15:20 +0000 (14:15 +0300)
commit24c2148c1ceb17186cc4e77279d7810d9f398f36
tree14b8329df36314ffa84d894f152bf83ab445520a
parent28da13b2d80022464d46a2cf38ad2c86b65d6876
parent7c805b777e569715bfafe788e15d7e61c72661d8
Merge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/fruitbalance