]> 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: 1256aab 24fae6d)
Merge branch 'master' into Mario/headshots
authorMario <mario.mario@y7mail.com>
Sat, 11 Jul 2020 13:04:54 +0000 (23:04 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 11 Jul 2020 13:04:54 +0000 (23:04 +1000)

Trivial merge