Merge branch 'master' into terencehill/itemstime
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 2 Aug 2015 10:08:07 +0000 (20:08 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 2 Aug 2015 10:08:07 +0000 (20:08 +1000)
commitf1a11cabe78baaaa067fe22bbdf2ca1546d1e8fc
tree588e00fc3df33ebc2ed480ffaffda539e216e85b
parent04454a65df4d8c82bcfc8c8d392265538cd1b52f
parentd643a85365a46cde125ddcdc5834bbfee9dbc532
Merge branch 'master' into terencehill/itemstime

# Conflicts:
# qcsrc/common/stats.qh
15 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/common/stats.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc