]> 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: 0e365ab 331cda6)
Merge branch 'master' into Mario/movetype_push
authorMario <mario.mario@y7mail.com>
Tue, 2 Jun 2020 12:12:49 +0000 (22:12 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 2 Jun 2020 12:12:49 +0000 (22:12 +1000)

Trivial merge