Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Tue, 4 Aug 2015 02:30:37 +0000 (12:30 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 4 Aug 2015 02:30:37 +0000 (12:30 +1000)
commit0e3eea33053f3a86b7b44b755c31b3147075598e
tree39ba91ac81af2287b327a3634318abea42dde04e
parent92284fbdefe87a7d201579e267d71bb7ae4e07a9
parent3cc7d984dec10cdbe7131b4b1a2362997d0eeadb
Merge branch 'master' into Mario/buff_updates

# Conflicts:
# effectinfo.txt
# qcsrc/common/notifications.qh
# qcsrc/common/stats.qh
14 files changed:
_hud_descriptions.cfg
effectinfo.txt
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_config.qc
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh