From: terencehill <piuntn@gmail.com>
Date: Sun, 21 Nov 2021 21:57:43 +0000 (+0000)
Subject: Merge branch 'terencehill/health_armor_icons' into 'master'
X-Git-Tag: xonotic-v0.8.5~288
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa71e4e191e6d10467a7bca2ea5cbde5628546ec;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/health_armor_icons' into 'master'

Add proper health / armor icons (used by the ItemStats and ItemsTime panels)

Closes #2561

See merge request xonotic/xonotic-data.pk3dir!941
---

fa71e4e191e6d10467a7bca2ea5cbde5628546ec