Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Mon, 2 Feb 2015 20:13:37 +0000 (07:13 +1100)
committerMario <zacjardine@y7mail.com>
Mon, 2 Feb 2015 20:13:37 +0000 (07:13 +1100)
commit530e06120a7b41f6175b1144fedf6903da8c13b0
treedb369451684e81c642aeb1457e7fcd64b2ea531c
parent9a6a0128b84883350982d582b14f5c25fa5a6881
parent61c76972374b56c3df73abc2a71fe665fffc2212
Merge branch 'master' into Mario/ctf_updates

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/progs.src
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_ctf.qh
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_ctf.qh