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

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

ae1cfaa3b536a5c074e80d6c0396712c4c119d5b