From: terencehill <piuntn@gmail.com>
Date: Sun, 1 May 2011 22:38:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/origin/fruitiex/panelhud' into terencehill... 
X-Git-Tag: xonotic-v0.5.0~262^2~5
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=acad3d9e40b3914f621d7a672453b48f22b2dc54

Merge remote-tracking branch 'remotes/origin/fruitiex/panelhud' into terencehill/newpanelhud

Conflicts:
	qcsrc/common/constants.qh
---

acad3d9e40b3914f621d7a672453b48f22b2dc54