Merge branch 'master' into Mario/gametypes
authorMario <mario.mario@y7mail.com>
Tue, 14 Jul 2020 07:56:35 +0000 (17:56 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 14 Jul 2020 07:56:35 +0000 (17:56 +1000)
1  2 
qcsrc/client/mutators/events.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge