]> 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: fcd0e1d e803bfa)
Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@yahoo.com.au>
Fri, 10 Jul 2020 15:55:47 +0000 (01:55 +1000)
committerbones_was_here <bones_was_here@yahoo.com.au>
Fri, 10 Jul 2020 15:55:47 +0000 (01:55 +1000)

Trivial merge