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)
commit5b7f9e34118d0f3b8f14b092f26baac27b0d4de5
tree85ae50cb4f45116b6956c99635b99303d3c0e38e
parent20d1c69e0d40efffc5f53359c0fc78bee971c3a1
parent1123945d2237f04671d4498f2da2aeef91e88f65
Merge branch 'master' into Mario/event_heal
qcsrc/server/g_damage.qc