]> de.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: 8db36e7 61749b7)
Merge branch 'master' into Mario/stepdown_maxspeed
authorMario <mario.mario@y7mail.com>
Sat, 23 May 2020 11:29:08 +0000 (21:29 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 23 May 2020 11:29:08 +0000 (21:29 +1000)

Trivial merge