]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 13 Jun 2010 20:35:49 +0000 (23:35 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 13 Jun 2010 20:35:49 +0000 (23:35 +0300)
commita9e41298d7a296528d3ab8aff39826c761f1ae89
treeb8d734ae388a1429768438e3f6048ac32b194c23
parent7c9aa340aac9c441b0d70c65ff616d324f9d63a3
parent18363d9f4594460fe7c53295cc528543bffa44f7
Merge remote branch 'origin/master' into fruitiex/newpanelhud