]> 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 22:41:43 +0000 (18:41 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Fri, 11 Jun 2010 22:41:43 +0000 (18:41 -0400)
commit888b3fcf30a8003ecd89460a0535ed77ddbb1377
tree0dbc05285a9065200449a83cc97d5f73b5cbf5b9
parent05c3c6e3a6abe0b8989243e21a55eadc0a65ec4a
parent059cc773de96707b220d59fd3d4f636a2b061f13
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud