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

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

1c4689c881297c46fffec3cf5a588967eb9d7dd0