Merge branch 'master' into terencehill/accuracy_shotgun
authorterencehill <piuntn@gmail.com>
Wed, 31 Jan 2018 18:17:40 +0000 (19:17 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 31 Jan 2018 18:17:40 +0000 (19:17 +0100)
commitb945d959784e5b249c66aea4f3326d8ae048f1cd
tree552b115041dafdaf414ff0734676c29ecd4dcd17
parentaff8020b9fbf75b9cceb0df0fc781cde77c8c7d3
parentef7fe075803e8c36a64360e2c8e5d5d3a82cbd60
Merge branch 'master' into terencehill/accuracy_shotgun

# Conflicts:
# qcsrc/server/g_damage.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/weapons/weapon/hagar.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/player.qc
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/tracing.qc