Merge branch 'master' into Mario/quickmenu_merge
authorMario <mario.mario@y7mail.com>
Tue, 10 Sep 2013 01:18:14 +0000 (11:18 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 10 Sep 2013 01:18:14 +0000 (11:18 +1000)
commitc092ab283a53142d3c9658bab30ec38e21e44f8c
treee8ff2f5d685eaf1659f64e0416beec5d531409ce
parentfb45b79ac9c90aec1fc28b009d3c164a1c43dc39
parent11c51a564e21f5f74ec7da33847cea4696b4f502
Merge branch 'master' into Mario/quickmenu_merge
17 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/util.qh
qcsrc/menu/classes.c