X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fconfig.subr;h=583da9de3c38d4614a4745ea96a95d2c61af7eb0;hp=c321232f9720e8fe4f66e91b19e60548e2af1a6f;hb=HEAD;hpb=2247898be55ea19995bc1c3d7b9b725ec5a4cd26

diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr
index c321232f..68f092a2 100644
--- a/misc/tools/all/config.subr
+++ b/misc/tools/all/config.subr
@@ -7,13 +7,14 @@ allrepos()
 	"$@" data/xonotic-data.pk3dir      xonotic-data.pk3dir.git      master         ""
 	"$@" data/xonotic-music.pk3dir     xonotic-music.pk3dir.git     master         ""
 	"$@" data/xonotic-nexcompat.pk3dir xonotic-nexcompat.pk3dir.git master         "no"
-	"$@" darkplaces                    darkplaces.git               div0-stable    "svn"
+	"$@" data/xonotic-xoncompat.pk3dir xonotic-xoncompat.pk3dir.git main           "no"
+	"$@" darkplaces                    darkplaces.git               master         ""
 	"$@" netradiant                    netradiant.git               master         ""
 	"$@" div0-gittools                 div0-gittools.git            master         "no"
 	"$@" d0_blind_id                   d0_blind_id.git              master         ""
 	"$@" data/xonotic-maps.pk3dir      xonotic-maps.pk3dir.git      master         ""
 	"$@" mediasource                   mediasource.git              master         "no"
-	"$@" gmqcc                         gmqcc.git                    master         ""
+	"$@" gmqcc                         gmqcc.git                    main           ""
 	"$@" xonstat                       xonstat.git                  master         "no"
 	"$@" xonstatdb                     xonstatdb.git                master         "no"
 	"$@" xonotic.org                   xonotic.org.git              master         "no"
@@ -32,12 +33,11 @@ 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/   ''
-	"$@" http de   http://de.git.xonotic.org/xonotic/  ''
+	# German host - disabled (divVerent).
+	"$@" git  ''   git://de.git.xonotic.org/xonotic/   ''
+	"$@" http ''   http://de.git.xonotic.org/xonotic/  ''
 
 	# Pushing destination (authoritative server; merlijn).
 	"$@" ssh  push ssh://git@gitlab.com/xonotic/       ''