From: terencehill <piuntn@gmail.com>
Date: Wed, 14 Jul 2010 20:33:14 +0000 (+0200)
Subject: Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~362^2~44
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=a3c1b020aadcb8cdd4a282b2604a45ad18ea1b4a;hp=-c

Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud

Conflicts:
	qcsrc/client/hud.qc
	qcsrc/client/hud.qh
---

a3c1b020aadcb8cdd4a282b2604a45ad18ea1b4a