]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 756832d 01a4bbd)
Merge "Disallow stealing the nb ball while dead"
authorbones_was_here <bones_was_here@xonotic.au>
Fri, 21 Feb 2025 16:52:00 +0000 (16:52 +0000)
committerbones_was_here <bones_was_here@xonotic.au>
Fri, 21 Feb 2025 16:52:00 +0000 (16:52 +0000)
Source branch: 'k9er/nb-stealing-fix'
Target branch: 'master'

Closes #2976

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


Trivial merge