From: sev <sev.ch@web.de>
Date: Wed, 30 Mar 2011 20:45:47 +0000 (+0200)
Subject: Merge branch 'sev/hudlayout' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev... 
X-Git-Tag: xonotic-v0.5.0~305^2~14^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=130d5a3f25f2704504aff5f0a0c8e400d210be1e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'sev/hudlayout' of ssh://git.xonotic.org/xonotic-data.pk3dir into sev/hudlayout
---

130d5a3f25f2704504aff5f0a0c8e400d210be1e