From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 15 Jul 2010 16:48:42 +0000 (+0300)
Subject: Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
X-Git-Tag: xonotic-v0.1.0preview~457^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=011669949c7ae08d148733133d64544f2ed2a13b

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

011669949c7ae08d148733133d64544f2ed2a13b