From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 4 Aug 2010 16:18:40 +0000 (+0300)
Subject: Merge branch 'terencehill/newpanelhud' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~362
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=06f163284faddd0c1e8d66e198eba4771e3ea2f8

Merge branch 'terencehill/newpanelhud' into fruitiex/newpanelhud
---

06f163284faddd0c1e8d66e198eba4771e3ea2f8