From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 29 Nov 2010 21:33:12 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/panelhud'
X-Git-Tag: xonotic-v0.1.0preview~94
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=1938f9b89a67e2379577e9b81ac30add9a9845fb

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

1938f9b89a67e2379577e9b81ac30add9a9845fb