From: terencehill Date: Mon, 22 Oct 2018 22:09:37 +0000 (+0200) Subject: Merge branch 'master' into terencehill/ft_autorevive_progress X-Git-Tag: xonotic-v0.8.5~688^2~19 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=22a952ce0284640d15f5bb1135f750c3a141f6a4;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/ft_autorevive_progress --- 22a952ce0284640d15f5bb1135f750c3a141f6a4