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

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

3dc4bb934f79bf6f7e989d031ce8af9b0d5a2db9