]> 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: ec5a560 9dd837c)
Merge branch 'drjaska/balance/crylink' into drjaska/balance/all
authordrjaska <drjaska83@gmail.com>
Sat, 3 Jun 2023 12:31:23 +0000 (15:31 +0300)
committerdrjaska <drjaska83@gmail.com>
Sat, 3 Jun 2023 12:31:23 +0000 (15:31 +0300)

Trivial merge