]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/ft_autorevive_progress
authorterencehill <piuntn@gmail.com>
Mon, 22 Oct 2018 22:09:37 +0000 (00:09 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 22 Oct 2018 22:09:37 +0000 (00:09 +0200)
1  2 
gamemodes-server.cfg

Simple merge