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

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

888b3fcf30a8003ecd89460a0535ed77ddbb1377