Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Thu, 10 Nov 2016 16:05:48 +0000 (02:05 +1000)
committerMario <mario@smbclan.net>
Thu, 10 Nov 2016 16:05:48 +0000 (02:05 +1000)
commit05c1916e1f78c8233a0eb88b5f619d31ac5c9569
treeae200ca64dcf407c906678bddf2cdf7dbf5493fa
parentcd4892b9fcd32bd4887f0b3bc2503894520945c7
parentc17146a306030f59d8b161e5f0f7f1f561f3d340
Merge branch 'master' into Mario/wepent_experimental
mutators.cfg
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qc