]> 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: 2a44628 8c55c3d)
Merge branch 'master' into terencehill/erebus_tweaks
authorterencehill <piuntn@gmail.com>
Sat, 2 May 2020 20:45:23 +0000 (22:45 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 2 May 2020 20:45:23 +0000 (22:45 +0200)

Trivial merge