]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d94813e 475c254)
Merge remote branch 'origin/sev/newpanelhudskin' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 28 Jul 2010 10:35:05 +0000 (13:35 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 28 Jul 2010 10:35:05 +0000 (13:35 +0300)

Trivial merge