]> 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: 6bbcaeb dad0572)
Merge branch 'master' into develop
authorterencehill <piuntn@gmail.com>
Thu, 28 Apr 2022 13:45:26 +0000 (15:45 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 28 Apr 2022 13:45:26 +0000 (15:45 +0200)

Trivial merge