Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Tue, 4 Aug 2015 16:11:26 +0000 (18:11 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 4 Aug 2015 16:11:26 +0000 (18:11 +0200)
commit3a4877cd66f71e3d958152d13c51f95c8ad94b18
treeeeb97ec3c86fa1911cff79eb455032c54caf3cd0
parentf1a11cabe78baaaa067fe22bbdf2ca1546d1e8fc
parent02e0727816326407cc681dd2d12c67d157e618cf
Merge branch 'master' into terencehill/itemstime

Conflicts:
_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/hud.qh
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/client/hud_config.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh