selfbuildagain branch is merged, no longer need to merge in the build script.

[xonotic/xonotic.git] / misc / infrastructure / xonotic-release-build.cron

diff --git a/misc/infrastructure/xonotic-release-build.cron b/misc/infrastructure/xonotic-release-build.cron
index 4390a63cd7d54293256bf437a7708de417c6a1c3..d5219460798e8d25f6c973935203ec0928d415b1 100755 (executable)
--- a/misc/infrastructure/xonotic-release-build.cron
+++ b/misc/infrastructure/xonotic-release-build.cron
@@ -68,11 +68,11 @@ cd ~/xonotic-release-build
 #   winners in the poll for upcoming CTF maps
 #   maps near completion
 
-for b in \
-       origin/divVerent/selfbuildagain \
-; 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/divVerent/selfbuildagain \
+#; 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