]> de.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: b2607e2 f021fcf)
Merge branch 'master' into drjaska/mgdamageaccumulation
authordrjaska <drjaska83@gmail.com>
Sun, 27 Nov 2022 03:26:52 +0000 (05:26 +0200)
committerdrjaska <drjaska83@gmail.com>
Sun, 27 Nov 2022 03:26:52 +0000 (05:26 +0200)

Trivial merge