]> 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: b508390 b91b5fd)
Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@xa.org.au>
Wed, 30 Sep 2020 17:20:40 +0000 (03:20 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Wed, 30 Sep 2020 17:20:40 +0000 (03:20 +1000)

Trivial merge