From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 6 May 2010 18:07:51 +0000 (+0300)
Subject: Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir... 
X-Git-Tag: xonotic-v0.1.0preview~541^2~206
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=190dff07ac02321207f8c32919a91fea442369d6;p=xonotic%2Fxonotic-data.pk3dir.git

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

190dff07ac02321207f8c32919a91fea442369d6