Merge branch 'master' into Mario/weapons_new
authorMario <zacjardine@y7mail.com>
Fri, 5 Dec 2014 12:03:18 +0000 (23:03 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 5 Dec 2014 12:03:18 +0000 (23:03 +1100)
1  2 
qcsrc/client/Main.qc
qcsrc/client/main.qh
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/teamplay.qc
qcsrc/server/vehicles/vehicles.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge