Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Tue, 20 Jan 2015 16:51:44 +0000 (17:51 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 20 Jan 2015 16:51:44 +0000 (17:51 +0100)
commitee32da5f4dafee5883369c759fe8ed042114bda5
treea6b4242c739f257e9f9d508b4a9fd30df2f73143
parentfe2c20aee6dd13a656f73eaa836e47a3f6fdca1a
parentdcf8a85693db60468fde21e1eaa64043576edb0d
Merge branch 'master' into terencehill/itemstime

Conflicts:
_hud_descriptions.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/t_items.qc
24 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/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/stats.qh
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c
qcsrc/server/cl_client.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/t_items.qc
qcsrc/server/waypointsprites.qc