]> 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: 55ee850 38dffd0)
Merge branch 'master' into terencehill/scoreboard_ui
authorterencehill <piuntn@gmail.com>
Sun, 8 Aug 2021 18:00:50 +0000 (20:00 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 8 Aug 2021 18:00:50 +0000 (20:00 +0200)

Trivial merge