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

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

ac70df42e80f7d6161b00b5115d800950dc1a106