]> 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: 6f2dda9 e90a0c6)
Merge branch 'master' into develop
authorMario <zacjardine@y7mail.com>
Tue, 1 Dec 2020 12:32:06 +0000 (22:32 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 1 Dec 2020 12:32:06 +0000 (22:32 +1000)

Trivial merge