Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Thu, 29 Dec 2016 06:02:34 +0000 (16:02 +1000)
committerMario <mario@smbclan.net>
Thu, 29 Dec 2016 06:02:34 +0000 (16:02 +1000)
commit57fd65c473599b6f069e15fe1e539f205141018b
tree71d1b4d8d2ef2c4b1a8112bd9b689f0855d73cb4
parent468b023e4b41cbd40bae363aa136b102a63fc811
parentdeafac153144404a737025eb09843495f8f1f0d2
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/server/miscfunctions.qc