Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Mon, 27 Jul 2015 23:21:26 +0000 (01:21 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 27 Jul 2015 23:21:26 +0000 (01:21 +0200)
commit8643336b62c2c2881987dabddc842a0214839012
tree280fe9da0446976e1c37ac8b43d63a5b36a8cbc1
parent53b471636ca180bbaa788777ed705b9b12a0427c
parent4caa2397ea1a778382ac278985185ac55f7f7d6f
Merge branch 'master' into terencehill/itemstime

Conflicts:
_hud_common.cfg
qcsrc/server/autocvars.qh
18 files changed:
_hud_common.cfg
defaultXonotic.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/mainwindow.qc
qcsrc/server/autocvars.qh
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