]> de.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: dd5acd9 4d771bf)
Merge branch 'terencehill/weapon_origin_fix' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 10 Oct 2021 08:29:30 +0000 (08:29 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 10 Oct 2021 08:29:30 +0000 (08:29 +0000)
Fix #694 and fix #1902

Closes #1902 and #694

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


Trivial merge