]> 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 | compact (merge: 3c4a446 c0c5970)
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 14 Jul 2010 17:23:57 +0000 (20:23 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 14 Jul 2010 17:23:57 +0000 (20:23 +0300)

Trivial merge