Merge branch 'master' into terencehill/ca_fixes_and_more
authorMario <zacjardine@y7mail.com>
Fri, 5 Dec 2014 11:28:02 +0000 (22:28 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 5 Dec 2014 11:28:02 +0000 (22:28 +1100)
commit405ed8bb55aac6155fe25e757bde8666176ee4c7
tree5bbb21346c9e808e71a5170e63cd9943212f955c
parentc13e637d555d6f1cdbfcdf3ff71001f6cee6aa0a
parentffc8306348654f791a14dfb6ffe918083067244c
Merge branch 'master' into terencehill/ca_fixes_and_more
gamemodes.cfg
qcsrc/client/Main.qc
qcsrc/client/scoreboard.qc
qcsrc/common/mapinfo.qh
qcsrc/common/notifications.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/teamplay.qc