]> 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: e2276f8 e9d7244)
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
authorSahil Singhal <sahil@sahil-desktop.(none)>
Sun, 13 Jun 2010 00:47:10 +0000 (20:47 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Sun, 13 Jun 2010 00:47:10 +0000 (20:47 -0400)

Trivial merge