Merge branch 'master' into terencehill/itemstime
authorMario <zacjardine@y7mail.com>
Sun, 10 May 2015 23:19:58 +0000 (09:19 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 10 May 2015 23:19:58 +0000 (09:19 +1000)
commit9eb82dd6fc682e3ddecd471835f9047816236342
tree4ae45be6eba0697d802ed5aa6dbf93343540f23e
parentee32da5f4dafee5883369c759fe8ed042114bda5
parent263c592e468eeeffb2755d204b21eb13e398adac
Merge branch 'master' into terencehill/itemstime

Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/hud.qh
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/menu/classes.c
qcsrc/server/defs.qh
25 files changed:
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luma.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/menu/classes.inc
qcsrc/menu/xonotic/dialog_hudpanel_itemstime.c
qcsrc/menu/xonotic/mainwindow.qc
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/t_items.qh
qcsrc/server/waypointsprites.qc