]> 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: c29ff3e b971d1d)
Merge branch 'master' into terencehill/erebus_tweaks
authorterencehill <piuntn@gmail.com>
Fri, 6 Mar 2020 17:59:29 +0000 (18:59 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 6 Mar 2020 17:59:29 +0000 (18:59 +0100)

Trivial merge