From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Wed, 9 Jun 2010 18:55:57 +0000 (-0400)
Subject: Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~76^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=18d86a6689cb95839ddcef1d13603751de753446;p=xonotic%2Fxonotic-data.pk3dir.git

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

18d86a6689cb95839ddcef1d13603751de753446