]> 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: 5adc9ca e55c9da)
Merge branch 'master' into terencehill/glowmod_color_fix
authorterencehill <piuntn@gmail.com>
Mon, 8 Jun 2020 18:30:41 +0000 (20:30 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 8 Jun 2020 18:30:41 +0000 (20:30 +0200)

Trivial merge