]> 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: d8a9797 3469a25)
Merge branch 'Mario/damagetext_reliable' into 'master'
authorMario <mario.mario@y7mail.com>
Sun, 20 Dec 2020 11:35:51 +0000 (11:35 +0000)
committerMario <mario.mario@y7mail.com>
Sun, 20 Dec 2020 11:35:51 +0000 (11:35 +0000)
Merge branch Mario/damagetext_reliable (S merge request)

Closes #2405

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


Trivial merge