Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 20:24:26 +0000 (23:24 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 20:24:26 +0000 (23:24 +0300)
commita36e2f5a19303584684bebb89e149e13da121668
treef6f3ef538f7d5a18b81d4ed60bc705eae64b7e24
parentea7f1f789591fe8bcdfc9c4a6cb6efb5930adf34
parentcc52f1e25e23bfe39ac964a0b56ce29f7002167f
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir