From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 24 Jul 2010 11:15:49 +0000 (+0300)
Subject: Merge branch 'fruitiex/newpanelhud' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~423^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b46fdcee5c729ccdf485d908803d06bbfdac2a8c;p=xonotic%2Fxonotic-data.pk3dir.git

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

b46fdcee5c729ccdf485d908803d06bbfdac2a8c