Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Wed, 21 Jan 2015 05:19:42 +0000 (16:19 +1100)
committerMario <zacjardine@y7mail.com>
Wed, 21 Jan 2015 05:19:42 +0000 (16:19 +1100)
commit9a6a0128b84883350982d582b14f5c25fa5a6881
tree93cbece39d7d1572106ea227c79fa13f0438a1e5
parent58cce7fecc3053bfe26066d67257dca6a3ffca14
parent017f6ab3e374687d6edfdaec69cb1a86bda7934b
Merge branch 'master' into Mario/ctf_updates

Conflicts:
qcsrc/common/items.qh
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
effectinfo.txt
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
qcsrc/server/mutators/gamemode_ctf.qh