From: Mario <zacjardine@y7mail.com>
Date: Mon, 8 Feb 2016 21:02:41 +0000 (+0000)
Subject: Merge branch 'terencehill/hud_shownames_fix' into 'master'
X-Git-Tag: xonotic-v0.8.2~1193
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79efc2666960623729d3256e76fd4629aa6a1188;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/hud_shownames_fix' into 'master'

Fix for #1643 "hud shownames health/armor status indicator: health jumps to 200? when teammate dies"



See merge request !282
---

79efc2666960623729d3256e76fd4629aa6a1188