]> 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: 5e09490 94494eb)
Merge branch 'AriosJentu/ItemsRespTimeSep' into 'master'
authorterencehill <piuntn@gmail.com>
Wed, 2 Aug 2023 16:33:13 +0000 (16:33 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 2 Aug 2023 16:33:13 +0000 (16:33 +0000)
Separate health and armor item respawning timers

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


Trivial merge