Merge branch 'master' into Mario/event_heal
authorMario <mario@smbclan.net>
Sun, 17 Jun 2018 07:16:51 +0000 (17:16 +1000)
committerMario <mario@smbclan.net>
Sun, 17 Jun 2018 07:16:51 +0000 (17:16 +1000)
1  2 
qcsrc/server/g_damage.qc

Simple merge