Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Sat, 24 Dec 2016 05:09:44 +0000 (15:09 +1000)
committerMario <mario@smbclan.net>
Sat, 24 Dec 2016 05:09:44 +0000 (15:09 +1000)
commit394ef402d22a2acd9e3990189f256f20dbcc4cba
tree2c10660fdae101a382b54eb4ec70329a6aa022dc
parentd365412f17cdfe9f8cc49fbeb54f9a636352fab5
parent511d25223860b15546fb6789453fc7cca5d28ee4
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/stats.qh