Merge branch 'master' into terencehill/ca_fixes
authorterencehill <piuntn@gmail.com>
Sun, 19 Oct 2014 16:14:04 +0000 (18:14 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 19 Oct 2014 16:14:04 +0000 (18:14 +0200)
commit49e5f5d2c7423c3c4536a57e6740d79d9b8eec94
tree359f9703fe01917c5857c70cb85cb1078c18cdda
parentc54d93af8df0be308d554e7c1921953ff4dd0401
parent14f88293289444c9a39357a88c1980c019733eff
Merge branch 'master' into terencehill/ca_fixes
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/command/sv_cmd.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_invasion.qc