From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 13 May 2010 17:04:15 +0000 (+0200)
Subject: Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir... 
X-Git-Tag: xonotic-v0.1.0preview~541^2~174^2~1
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6b912e45d2d729fb157d3caebd6587a90c43d166

Merge branch 'fruitiex/newpanelhud' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/newpanelhud
---

6b912e45d2d729fb157d3caebd6587a90c43d166