]> 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 | compact (merge: 6d40530 830f774)
Merge branch 'master' into Mario/waterjump_fix
authorMario <mario.mario@y7mail.com>
Sat, 23 May 2020 12:16:04 +0000 (22:16 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 23 May 2020 12:16:04 +0000 (22:16 +1000)

Trivial merge