]> 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: 53eae19 8411e84)
Merge branch 'master' into Mario/mehrdad08_spectatorlist Mario/mehrdad08_spectatorlist
authordrjaska <drjaska83@gmail.com>
Fri, 31 Mar 2023 01:19:57 +0000 (04:19 +0300)
committerdrjaska <drjaska83@gmail.com>
Fri, 31 Mar 2023 01:19:57 +0000 (04:19 +0300)

Trivial merge