]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08c1a7d c92b1b2)
Merge branch 'terencehill/boil_trigger_hurt' into 'master'
authorMirio <opivy@hotmail.de>
Sat, 5 Aug 2017 16:02:40 +0000 (16:02 +0000)
committerMirio <opivy@hotmail.de>
Sat, 5 Aug 2017 16:02:40 +0000 (16:02 +0000)
Boil: move trigger_hurt down

See merge request !103


Trivial merge