Merge branch 'master' into Mario/hagar_notfixed
authorMario <mario@smbclan.net>
Thu, 24 Mar 2016 20:08:41 +0000 (06:08 +1000)
committerMario <mario@smbclan.net>
Thu, 24 Mar 2016 20:08:41 +0000 (06:08 +1000)
commit37cf62041a76248472ef6a78feaaed33e35a2260
tree568e8cc073e56877d9d4e8976ab3f77a995572cd
parentfc0f6c588aa716a6314a18813c760c2861cce3af
parentbf80bc5d1726128f415d3a7de1a47adb4f477980
Merge branch 'master' into Mario/hagar_notfixed

# Conflicts:
# qcsrc/common/weapons/weapon/hagar.qc
qcsrc/client/view.qc
qcsrc/common/weapons/weapon/hagar.qc