From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Fri, 11 Jun 2010 21:08:37 +0000 (-0400)
Subject: Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~62
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05c3c6e3a6abe0b8989243e21a55eadc0a65ec4a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
---

05c3c6e3a6abe0b8989243e21a55eadc0a65ec4a