]> 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: 84df0ef 9b5d62a)
Merge branch 'drjaska/mayhem' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 5 Mar 2023 18:35:33 +0000 (18:35 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 5 Mar 2023 18:35:33 +0000 (18:35 +0000)
Mayhem and Team Mayhem gamemodes

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


Trivial merge