From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 17 Jun 2010 08:48:35 +0000 (+0300)
Subject: Merge remote branch 'origin/terencehill/newpanelhud' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~22
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d02a7ca9ba75edf897d843e7dfb5635ad7dd23f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/newpanelhud' into fruitiex/newpanelhud
---

1d02a7ca9ba75edf897d843e7dfb5635ad7dd23f