]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9877a4 085858c)
Merge branch 'terencehill/health_armor_icons' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 21 Nov 2021 21:57:43 +0000 (21:57 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 21 Nov 2021 21:57:43 +0000 (21:57 +0000)
Add proper health / armor icons (used by the ItemStats and ItemsTime panels)

Closes #2561

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


Trivial merge