Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 02:00:34 +0000 (13:00 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 02:00:34 +0000 (13:00 +1100)
commit5b9d6b7e214e7c48d7de4f1c7d62006707463135
tree79463cdb55640d0f42dd16d473d8eee08e5f2f64
parentebbefc97022610c6d20140d3e16ba0c3e494fa1a
parent0b50c5b420fff105059d69ce49b5e2774c3170d9
Merge branch 'master' into Mario/ctf_updates

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