]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5302ab3 daf5905)
Merge branch 'terencehill/sources' into 'master'
authorterencehill <piuntn@gmail.com>
Wed, 23 Feb 2022 17:17:59 +0000 (17:17 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 23 Feb 2022 17:17:59 +0000 (17:17 +0000)
Add health and armor icons and Blaster source files

See merge request xonotic/mediasource!22


Trivial merge