]> 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: 80ffd95 5cb9126)
Merge branch 'master' into terencehill/race_cleanups
authorterencehill <piuntn@gmail.com>
Thu, 11 Mar 2021 15:04:04 +0000 (16:04 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 11 Mar 2021 15:04:04 +0000 (16:04 +0100)

Trivial merge