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

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

517e4ac52068c6df8f0283db5e7783d9dea8b80e