]> 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: d81eb6a 54566b1)
Merge branch 'terencehill/seconds_tostring'
authorterencehill <piuntn@gmail.com>
Sun, 6 Feb 2022 15:03:52 +0000 (16:03 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 6 Feb 2022 15:03:52 +0000 (16:03 +0100)

Trivial merge