]> 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: 6d3a118 66685d1)
Merge remote-tracking branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Sun, 1 May 2011 10:42:56 +0000 (13:42 +0300)
committerFruitieX <fruitiex@gmail.com>
Sun, 1 May 2011 10:42:56 +0000 (13:42 +0300)

Trivial merge