Merge branch 'martin-t/dmgtext2' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 9 Jul 2017 00:59:54 +0000 (00:59 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 9 Jul 2017 00:59:54 +0000 (00:59 +0000)
commit90b55a65862014d4147a4cc951e2c89e1139cb4e
tree01eb7c2e542beb0f1266abc322b15d64eedac749
parent07fa7468e42c0c782caf12c6c8cb3c125672a0f4
parent354c011e5cd0bc5063cf5e9eea25ce0616040c5c
Merge branch 'martin-t/dmgtext2' into 'master'

2D damagetext

Closes #1716

See merge request !439