From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 15 Nov 2010 20:40:21 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/panelhud'
X-Git-Tag: xonotic-v0.1.0preview~134
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=c6bfdc5e01bfdf352c43ec041657dad2e6cb6a3f;p=xonotic%2Fxonotic-data.pk3dir.git

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

c6bfdc5e01bfdf352c43ec041657dad2e6cb6a3f