]> 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: d14f3f5 abcbf63)
Merge branch 'drjaska/balance/vortex' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 10 Jan 2022 04:22:44 +0000 (04:22 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 10 Jan 2022 04:22:44 +0000 (04:22 +0000)
https://forums.xonotic.org/showthread.php?tid=8520 related vortex changes

See merge request xonotic/xonotic-data.pk3dir!882


Trivial merge