]> 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: b3b025b 2910d08)
Merge branch 'Mario/matchcount' into 'develop'
authorMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 13:55:39 +0000 (13:55 +0000)
committerMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 13:55:39 +0000 (13:55 +0000)
Merge branch Mario/matchcount (XXS merge request)

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


Trivial merge