From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 21 Oct 2010 20:08:18 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/newpanelhud'
X-Git-Tag: xonotic-v0.1.0preview~267
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;ds=inline;h=301c2eb1ecefbfca43e8a34359c83b6b06b2777e;p=xonotic%2Fxonotic-data.pk3dir.git

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

301c2eb1ecefbfca43e8a34359c83b6b06b2777e