]> 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: 3c6e09b 98d732b)
Merge branch 'master' into drjaska/Mario/mehrdad08_spectatorlist
authordrjaska <drjaska83@gmail.com>
Fri, 24 Mar 2023 15:11:38 +0000 (17:11 +0200)
committerdrjaska <drjaska83@gmail.com>
Fri, 24 Mar 2023 15:11:38 +0000 (17:11 +0200)

Trivial merge