Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Tue, 27 Dec 2016 12:44:01 +0000 (22:44 +1000)
committerMario <mario@smbclan.net>
Tue, 27 Dec 2016 12:44:01 +0000 (22:44 +1000)
commit468b023e4b41cbd40bae363aa136b102a63fc811
tree05ba86e017f9adc3c7c59b06031f034e6eb4c30f
parentb5442fdfdf2e03ce9ac6d80508037a8a7b4c35ba
parent936e07981f6ca4beacadd708ca991895f4f74596
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/server/weapons/weaponsystem.qc
qcsrc/common/t_items.qc
qcsrc/server/weapons/weaponsystem.qc