projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4557ec2 18e1dbf)
Merge branch 'Mario/pokenade_crash_fix' into 'master'
authorLegendaryGuard <rootuser999@gmail.com>
Sat, 2 Jul 2022 09:34:12 +0000 (09:34 +0000)
committerLegendaryGuard <rootuser999@gmail.com>
Sat, 2 Jul 2022 09:34:12 +0000 (09:34 +0000)
Merge branch Mario/pokenade_crash_fix (XS merge request)

Closes #2703

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


Trivial merge