]> 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: de25986 3d3ebfd)
Merge branch 'Mario/weapon_alias_fix' into 'master'
authorLegendaryGuard <rootuser999@gmail.com>
Thu, 7 Jul 2022 22:59:42 +0000 (22:59 +0000)
committerLegendaryGuard <rootuser999@gmail.com>
Thu, 7 Jul 2022 22:59:42 +0000 (22:59 +0000)
Merge branch Mario/weapon_alias_fix (XS merge request)

Closes #2714

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


Trivial merge