Merge branch 'master' into terencehill/quickmenu
authorterencehill <piuntn@gmail.com>
Tue, 19 Mar 2013 16:34:21 +0000 (17:34 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 19 Mar 2013 16:34:21 +0000 (17:34 +0100)
commitb4af8be2abfa8caeceb2fc714c3effb09acf910d
treed218a36f1b26d591f380a3950a39ebe7d1f57fe3
parentedfb82123fa0867707f0efd2f2dd9e170263aa1b
parent489318817dc508e24f479090ddcf53ace10adbf0
Merge branch 'master' into terencehill/quickmenu

Conflicts:
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
18 files changed:
_hud_common.cfg
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/menu/classes.c