]> 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: 2300b0c 0256315)
Merge branch 'master' into Mario/damagetext_reliable
authorMario <zacjardine@y7mail.com>
Sun, 13 Dec 2020 18:02:56 +0000 (04:02 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 13 Dec 2020 18:02:56 +0000 (04:02 +1000)

Trivial merge