From: FruitieX <fruitiex@gmail.com>
Date: Sat, 14 May 2011 13:04:28 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud
X-Git-Tag: xonotic-v0.5.0~262
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=48fccca0eefd5b290d47ff7f86064962f9c8a0e1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud
---

48fccca0eefd5b290d47ff7f86064962f9c8a0e1