Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Tue, 29 Nov 2016 14:03:52 +0000 (00:03 +1000)
committerMario <mario@smbclan.net>
Tue, 29 Nov 2016 14:03:52 +0000 (00:03 +1000)
commitfde04a29ed6f249c904737ae21ff44f400f1f453
treebe5ed72ad8fdfcd693d4ec1dd864d6341778f7bb
parentcbca1a79315fe08c4796273a490a4d12b7d3291d
parentffb677bba14c81963045d979714dd5cce8053d20
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/mutators/mutator/nades/nades.qc
mutators.cfg
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/physics/player.qc
qcsrc/server/client.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/events.qh