From: terencehill <piuntn@gmail.com>
Date: Sat, 4 Dec 2021 22:45:51 +0000 (+0000)
Subject: Merge branch 'z411/powerups_dropondeath' into 'master'
X-Git-Tag: xonotic-v0.8.5~273
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb8c9f9915bdaff154b2cf3d757c3b3bcbcbaa1c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'z411/powerups_dropondeath' into 'master'

Merge branch z411/powerups_dropondeath (improves on Mario's implementation)

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

cb8c9f9915bdaff154b2cf3d757c3b3bcbcbaa1c