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

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

c7c7ab48caeada278298ad8b3db9d21fad024226