]> 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: b123849 f0c7be8)
Merge branch 'master' into develop
authorterencehill <piuntn@gmail.com>
Fri, 22 Apr 2022 20:19:39 +0000 (22:19 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 22 Apr 2022 20:19:39 +0000 (22:19 +0200)

Trivial merge