]> 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: 3dc777e ff54396)
Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 16 Jun 2010 17:15:45 +0000 (20:15 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 16 Jun 2010 17:15:45 +0000 (20:15 +0300)

Trivial merge