From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 10 Feb 2018 02:40:56 +0000 (+0000)
Subject: Merge branch 'DefaultUser/zsh_autocomplete' into 'master'
X-Git-Tag: xonotic-v0.8.5~184
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=06f78be4eba3c99ef500ae7cddab7a6efe528019;hp=fba439b643ded0ba99c697cbc5ffd06f6eb0aa8b

Merge branch 'DefaultUser/zsh_autocomplete' into 'master'

Add zsh autocompletion for the all script

See merge request xonotic/xonotic!33
---

diff --git a/README.md b/README.md
index 11bc8b7c..0af26ac4 100644
--- a/README.md
+++ b/README.md
@@ -34,4 +34,4 @@ The community is primarily active in the [forums](http://forums.xonotic.org/) an
 
 ## License
 
-Distributed under the GPLv2 license. See the [LICENSE](LICENSE) file for more details.
+Distributed under the GPLv2 license. See the [COPYING](COPYING) file for more details.
diff --git a/misc/infrastructure/checkupdate.txt b/misc/infrastructure/checkupdate.txt
index 8383e89f..47eba2eb 100644
--- a/misc/infrastructure/checkupdate.txt
+++ b/misc/infrastructure/checkupdate.txt
@@ -41,6 +41,8 @@ R J9JepdOZjvCBXYfz8fj3civ4PulKF4/asnK9u5ZojYg=
 R 6QtAVwbWcJFYZDvSeuZHEaaJE4JoTzmNni/LPZUSOKE=
 R Lh+WWOrY7IjXqP7pekmlgy6R+N+tTBm6DBV1gUZvtZ4=
 R ggH3OBVqbVeCCBkLQZtFLvwxuTpfBAz+/scg3OwsPVo=
+R kV3UkVGqke8UhrgIWKhTOU/nDhk3f+OT7TVEfqh9xy0=
+R AaQzHJT+/f6XHfZ4Zabz2KR7dXwQsoKJ1XYICRNo7to=
 
 # Promoted servers. Always show up as recommended, even if "slow".
 # P <key or IP here>
diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr
index c321232f..03499ba9 100644
--- a/misc/tools/all/config.subr
+++ b/misc/tools/all/config.subr
@@ -32,8 +32,7 @@ allmirrors()
 	"$@" http ''   http://us.git.xonotic.org/xonotic/  ''
 
 	# Gitlab host (divVerent).
-	# Disabled because of https://gitlab.com/gitlab-com/support-forum/issues/15
-	"$@" http ''   https://gitlab.com/xonotic/         ''
+	"$@" http gitlab   https://gitlab.com/xonotic/     ''
 
 	# German host (divVerent).
 	"$@" git  de   git://de.git.xonotic.org/xonotic/   ''
diff --git a/server/help.cfg b/server/help.cfg
index 93def288..3cb465ae 100644
--- a/server/help.cfg
+++ b/server/help.cfg
@@ -79,7 +79,7 @@ set help_tmp_index 0
 alias help_say "set help_tmp_oldnick \"$sv_adminnick\"; set sv_adminnick \"$help_cfg_nick\"; say \"$*\"; help_say2"
 alias help_say2 "set sv_adminnick \"$help_tmp_oldnick\""
 alias help_doit "sv_cmd rpn /help_tmp_msg help_msg_$help_tmp_index def; help_doit2"
-alias help_doit2 "help_say $help_cfg_prefix\"$help_tmp_msg\""
+alias help_doit2 "help_say $help_cfg_prefix$help_tmp_msg"
 alias help_inc "sv_cmd rpn /help_tmp_index help_tmp_index 1 add $help_msg_count mod def"
 alias help_next "help_inc; help_doit"
 alias help_loop "help_next; defer $help_cfg_time help_loop"