]> 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: b7f8e5e cc7bbb7)
Merge branch 'master' into Mario/headshots
authorMario <mario.mario@y7mail.com>
Wed, 3 Jun 2020 13:00:02 +0000 (23:00 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 3 Jun 2020 13:00:02 +0000 (23:00 +1000)

Trivial merge