]> 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: fd87d34 41f9357)
Merge branch 'Mario/rocket_blaster_fix' into 'master'
authorterencehill <piuntn@gmail.com>
Wed, 8 Feb 2023 19:08:34 +0000 (19:08 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 8 Feb 2023 19:08:34 +0000 (19:08 +0000)
Check to make sure neither entity has been freed when calling touch functions

Closes #2811

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


Trivial merge