From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 9 Jun 2010 20:26:06 +0000 (+0300)
Subject: Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~76
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b23a94cbbcf014fdecbce2cc0a02f50e1bae5efe;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
---

b23a94cbbcf014fdecbce2cc0a02f50e1bae5efe