]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitef1ca2543a39a330f6c619ee3e8707efd7252563
tree4921d940ada7bedbb2369761e1fc511780648070
parentde259860fa1e9840736aa2d6bc5d5f779cbdf06e
parent3d3ebfd0c19b0b6149ae1f8e990de93921e84552
Merge branch 'Mario/weapon_alias_fix' into 'master'

Merge branch Mario/weapon_alias_fix (XS merge request)

Closes #2714

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