From: terencehill <piuntn@gmail.com>
Date: Wed, 23 Feb 2022 17:17:59 +0000 (+0000)
Subject: Merge branch 'terencehill/sources' into 'master'
X-Git-Tag: xonotic-v0.8.5~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=544569e6c2a04537784ad8cf2d763b8420c302e6;p=xonotic%2Fmediasource.git

Merge branch 'terencehill/sources' into 'master'

Add health and armor icons and Blaster source files

See merge request xonotic/mediasource!22
---

544569e6c2a04537784ad8cf2d763b8420c302e6