]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
authorSahil Singhal <sahil@sahil-desktop.(none)>
Fri, 11 Jun 2010 21:08:37 +0000 (17:08 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Fri, 11 Jun 2010 21:08:37 +0000 (17:08 -0400)
commit05c3c6e3a6abe0b8989243e21a55eadc0a65ec4a
tree30552d96bee30390692173deb6e0ea09fa7f964e
parentc666676ffb48e39a77fa04a5ce96c31ddad67401
parent25f45feccc0f411ac02a1bb13f19c9c73083f9b2
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud