Merge branch 'Mario/event_heal' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 18 Jun 2018 01:23:07 +0000 (01:23 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 18 Jun 2018 01:23:07 +0000 (01:23 +0000)
commit68bea9632f5a193d608cf7aab9f6c38ae882ce0d
tree45e71190ee8b518ed6d7d7e569eeec53fd65ec3e
parent038306cf3f283ca719011d71c75f28969f6f1063
parentc20bf1f385b30f302eda2175502d0059cff79506
Merge branch 'Mario/event_heal' into 'master'

Merge branch Mario/event_heal (M merge request)

See merge request xonotic/xonotic-data.pk3dir!569
qcsrc/common/mapobjects/trigger/heal.qc