]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a71f17 8fa8508)
Merge branch 'terencehill/hud_shownames_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 8 Feb 2016 21:02:41 +0000 (21:02 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 8 Feb 2016 21:02:41 +0000 (21:02 +0000)
Fix for #1643 "hud shownames health/armor status indicator: health jumps to 200? when teammate dies"

See merge request !282


Trivial merge