Merge branch 'master' into Mario/vehicles
authorMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:10:54 +0000 (13:10 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:10:54 +0000 (13:10 +1100)
commit3bd825ec4ff3c071ccefb2b4424339b3b4b49315
tree57174bbcbc3cf7320b08a05ec9f81b5803724863
parent198765425d8c346faa41b601cba98247ca2ddac2
parent26f37b6d480a3a276af0ab52ac340dd110186704
Merge branch 'master' into Mario/vehicles

Conflicts:
qcsrc/common/constants.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/progs.src
17 files changed:
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/progs.src
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_hook.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/progs.src