]> 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: bacf7fa 0637aaf)
Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 23 Jul 2010 19:03:07 +0000 (22:03 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 23 Jul 2010 19:03:07 +0000 (22:03 +0300)

Trivial merge