Merge branch 'master' into terencehill/itemstime
authorMario <zacjardine@y7mail.com>
Tue, 11 Aug 2015 16:28:36 +0000 (02:28 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 11 Aug 2015 16:28:36 +0000 (02:28 +1000)
commit3108bc8ea930e133184d3055677d706c7ecaa833
tree314ff4ccd143895ebdbb5ca3d71127e0f09c4d40
parent5f86399851c920638ee8f8f166b44c7c295d4aa5
parent367e29dae1e4e500e95743064bcd1db66ab62ca9
Merge branch 'master' into terencehill/itemstime

# Conflicts:
# qcsrc/client/hud.qc
# qcsrc/client/hud_config.qc
# qcsrc/common/stats.qh
# qcsrc/menu/xonotic/mainwindow.qc
# qcsrc/server/autocvars.qh
17 files changed:
_hud_descriptions.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/common/constants.qh
qcsrc/common/stats.qh
qcsrc/menu/classes.inc
qcsrc/menu/xonotic/mainwindow.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc