X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=35e23577732915c58d167ceba7a42ecbb9d0d13e;hp=1b29784dc4e9e5d8f22276ddf534a92b5ac516e9;hb=15372641233388292460ff84d2cb1af82e8e5c76;hpb=bdc9d82566d9ec5ad934c2ddcf32244e3aee02e3

diff --git a/all b/all
index 1b29784d..35e23577 100755
--- a/all
+++ b/all
@@ -275,6 +275,7 @@ fix_upstream_rebase()
 	r_r=${r_r#refs/heads/}
 	r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
 	r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
+	r_bra=${r_bra#refs/heads/}
 	if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
 		if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
 			return
@@ -1657,7 +1658,7 @@ case "$cmd" in
 				# back out of: source/qcsrc/server
 				;;
 			release)
-				verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
+				verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
 				;;
 		esac
 		verbose rm -f Xonotic/source/*/fteqcc.log
@@ -1749,6 +1750,13 @@ case "$cmd" in
 				s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
 				s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
 			" defaultXonotic.cfg
+			case "$RELEASETYPE" in
+				release)
+					echo "" >> defaultXonotic.cfg
+					echo "// nicer menu" >> defaultXonotic.cfg
+					echo "set menu_watermark \"\"" >> defaultXonotic.cfg
+					;;
+			esac
 			(
 				verbose cd gfx/menu/luminos
 				verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .