]> 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: 56c5e62 47ec820)
Merge branch 'master' into drjaska/effectinfo
authordrjaska <drjaska83@gmail.com>
Fri, 12 Nov 2021 13:03:06 +0000 (15:03 +0200)
committerdrjaska <drjaska83@gmail.com>
Fri, 12 Nov 2021 13:03:06 +0000 (15:03 +0200)

Trivial merge