]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into drjaska/classic-weapon drjaska/classic-weapon
authordrjaska <drjaska83@gmail.com>
Fri, 2 Dec 2022 15:09:28 +0000 (17:09 +0200)
committerdrjaska <drjaska83@gmail.com>
Fri, 2 Dec 2022 15:09:28 +0000 (17:09 +0200)
commit8b46ef7c5a07eef90f07d376f0fd8aa05e6cb891
tree6debc7317fddff3837d03d27d18ea41a95f53ea4
parentaad3265c6bf978aa19e923ac69d8dd719d342e85
parent35849c544117829747b66a9b1def520a6d2c6ec0
Merge branch 'master' into drjaska/classic-weapon