]> 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: 1236b06 5c40b04)
Merge branch 'master' into terencehill/ft_autorevive_progress
authorterencehill <piuntn@gmail.com>
Sun, 24 Feb 2019 21:57:53 +0000 (22:57 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 24 Feb 2019 21:57:53 +0000 (22:57 +0100)

Trivial merge