From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Sun, 13 Jun 2010 00:47:10 +0000 (-0400)
Subject: Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fd56a64352f62db14e6bf4a7a2f40e66d3fa7579;p=xonotic%2Fxonotic-data.pk3dir.git

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

fd56a64352f62db14e6bf4a7a2f40e66d3fa7579