Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 18:16:55 +0000 (21:16 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 18:16:55 +0000 (21:16 +0300)
commitea7f1f789591fe8bcdfc9c4a6cb6efb5930adf34
tree7f658ba0d4f41dccb2fd4bcfecbb37817798a73e
parent4af2be23b3c291db175ce4ac0d765f7e7f7c8606
parent4c4cb17a6d750a957ade68c0ffddc269b643cb2a
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir