From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 23 Jul 2010 23:26:04 +0000 (+0300)
Subject: Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
X-Git-Tag: xonotic-v0.1.0preview~400^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dc5881177da0f195c6e730c18ecabc39a8a58e8f;p=xonotic%2Fxonotic-data.pk3dir.git

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

dc5881177da0f195c6e730c18ecabc39a8a58e8f