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

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

5fca782f85c8971b23b76e610183dd273d4381b2