Merge branch 'master' into terencehill/ca_fixes
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 17:47:08 +0000 (04:47 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 17:47:08 +0000 (04:47 +1100)
commit616d99d79237801b1764601653995b3afc88448a
tree53a4ef0a389e4686b5f64ca12826e7ea12e974aa
parent49e5f5d2c7423c3c4536a57e6740d79d9b8eec94
parentd51c9ed7a2355f4456f50867741807ab9c9d28d3
Merge branch 'master' into terencehill/ca_fixes

Conflicts:
qcsrc/common/mapinfo.qh
qcsrc/common/notifications.qh
qcsrc/server/mutators/gamemode_freezetag.qc
gamemodes.cfg
qcsrc/common/mapinfo.qh
qcsrc/common/notifications.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/cmd.qc
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_freezetag.qc