From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 16 Jun 2010 17:15:45 +0000 (+0300)
Subject: Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~30
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dfbd79fb9c8e4be1eaf9f4a417320b9488811f91;p=xonotic%2Fxonotic-data.pk3dir.git

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

dfbd79fb9c8e4be1eaf9f4a417320b9488811f91