]> 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: 42dc3fa bad5ccc)
Merge branch 'master' into drjaska/morosophos/server-current4
authordrjaska <drjaska83@gmail.com>
Tue, 2 Jul 2024 04:45:08 +0000 (07:45 +0300)
committerdrjaska <drjaska83@gmail.com>
Tue, 2 Jul 2024 04:45:08 +0000 (07:45 +0300)

Trivial merge