]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e277420 a73cf03)
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
authorSahil Singhal <sahil@sahil-desktop.(none)>
Wed, 9 Jun 2010 18:55:57 +0000 (14:55 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Wed, 9 Jun 2010 18:55:57 +0000 (14:55 -0400)

Trivial merge