From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 14 May 2010 15:39:25 +0000 (+0300)
Subject: Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir... 
X-Git-Tag: xonotic-v0.1.0preview~541^2~174
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=76f8ba51a707c86d48a1c3cfb070e25ae5045f1f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/newpanelhud
---

76f8ba51a707c86d48a1c3cfb070e25ae5045f1f