From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 12 Dec 2010 13:50:24 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/panelhud'
X-Git-Tag: xonotic-v0.1.0preview~49
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b195663656a3d909655f41a99adb95c0b1da2fd9;p=xonotic%2Fxonotic-data.pk3dir.git

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

b195663656a3d909655f41a99adb95c0b1da2fd9