]> 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: b0abca0 d144c81)
Merge branch 'terencehill/frags_remaining_announcer'
authorterencehill <piuntn@gmail.com>
Wed, 25 Mar 2020 17:47:52 +0000 (18:47 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 25 Mar 2020 17:47:52 +0000 (18:47 +0100)

Trivial merge