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

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

24542f2e7b1da4dfd0d8fe206ba1278e9bb463e1