From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 16 Jul 2010 09:46:15 +0000 (+0300)
Subject: Merge branch 'fruitiex/newpanelhud' into fruitiex/newpanelhud_stable
X-Git-Tag: xonotic-v0.1.0preview~457^2
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=a602049efb3a836729c2497950fbffbd77ad9b6e;hp=-c

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

a602049efb3a836729c2497950fbffbd77ad9b6e