Merge branch 'master' into Mario/ons_updates
authorMario <zacjardine@y7mail.com>
Sun, 23 Aug 2015 10:20:26 +0000 (20:20 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 23 Aug 2015 10:20:26 +0000 (20:20 +1000)
commitc67e77ba36fb8dd44b39722e41943b6671b549ff
tree964c9541d88d28d7caca07839dbda0069b6811ae
parent21a71ba72bc23a31facd74afba5faef0cad72a27
parent4b7b0e137af409648a48002058cff08e2da542b9
Merge branch 'master' into Mario/ons_updates

# Conflicts:
# qcsrc/client/view.qc
# qcsrc/common/constants.qh
# qcsrc/server/g_damage.qc
# qcsrc/server/mutators/gamemode_onslaught.qc
20 files changed:
qcsrc/client/autocvars.qh
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/client/view.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutators_include.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc
qcsrc/server/waypointsprites.qc