]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aad3265 35849c5)
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)

Trivial merge