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)
1  2 
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

diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge