Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Thu, 9 Jul 2015 06:37:31 +0000 (16:37 +1000)
committerMario <zacjardine@y7mail.com>
Thu, 9 Jul 2015 06:37:31 +0000 (16:37 +1000)
commitfc62dfa34fa5b13d63660d5249633af1222d6476
treec5a3bbdc94168b2ce747514107a54507845410fe
parent3288cfea33b3c86d4f7945d58cb31fe30969c2a8
parent44968fcb5b31c35a0e662906a8b9542ab3933561
Merge branch 'master' into Mario/ctf_updates

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