]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 347acd3 bfce4a2)
Merge branch 'master' into TimePath/guide
authorMario <mario.mario@y7mail.com>
Sun, 18 Oct 2020 21:59:31 +0000 (07:59 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 18 Oct 2020 21:59:31 +0000 (07:59 +1000)

Trivial merge