]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 4e265c4 c9347b6)
Merge branch 'master' into Mario/headshots
authorMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 19:11:06 +0000 (05:11 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 19:11:06 +0000 (05:11 +1000)

Trivial merge