Disable feature branches in the release script, since they no longer exist

diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron
index 24f7d4fc939a397280aa6a06e4a265cf8f0c8213..5bed45e6ff5f6e8ca4b34e72850f865bd30462fc 100755 (executable)
--- a/misc/infrastructure/xonotic-release-build.cron
+++ b/misc/infrastructure/xonotic-release-build.cron
@@ -39,13 +39,15 @@ cd ~/xonotic-release-build
 # map branches that we include:
 #   winners in the poll for upcoming CTF maps
 #   maps near completion
+# uncomment below when a branch is needed
+# the listed branches are examples only
 
-for b in \
-       origin/fruitiex/runningmanctf \
-       origin/mintox/geoplanetary
-do
-       b=$b ./all each sh -c 'if git rev-parse $b >/dev/null 2>&1; then git merge $b; fi'
-done
+#for b in \
+#      origin/fruitiex/runningmanctf \
+#      origin/mintox/geoplanetary
+#do
+#      b=$b ./all each sh -c 'if git rev-parse $b >/dev/null 2>&1; then git merge $b; fi'
+#done
 ./all update -N
 d0=`date +%Y%m%d`
 d=$d0