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

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

01b43851dfcf0f9197a8fbfcbe1ba03be6747c9d