Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release…

… ba=release
i3roly · Mar 18, 2024 · 35996fd · 35996fd
1 parent 601d59c
commit 35996fd
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/CLOBBER b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Removed proxying objects - Bug 1878638: Remove handle duplication rules for Windows process sandboxes
+Merge day clobber 2024-03-18
diff --git a/browser/config/mozconfigs/linux32/l10n-mozconfig b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,5 +1,5 @@
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 ac_add_options --disable-nodejs
 
 . "$topsrcdir/build/mozconfig.no-compile"

diff --git a/browser/config/mozconfigs/linux64/l10n-mozconfig b/browser/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,5 +1,5 @@
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 
 . "$topsrcdir/build/mozconfig.no-compile"
 ac_add_options --disable-nodejs

diff --git a/browser/config/mozconfigs/macosx64/l10n-mozconfig b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -10,7 +10,7 @@ if test `uname -s` = "Linux"; then
 fi
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 
 ac_add_options --disable-nodejs
 unset NODEJS

diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -3,7 +3,7 @@
 . "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 
 ac_add_options --disable-nodejs
 unset NODEJS

diff --git a/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig b/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig
@@ -3,7 +3,7 @@
 . "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 
 ac_add_options --disable-nodejs
 unset NODEJS

diff --git a/browser/config/mozconfigs/win64/l10n-mozconfig b/browser/config/mozconfigs/win64/l10n-mozconfig
@@ -3,7 +3,7 @@
 . "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 
 ac_add_options --disable-nodejs
 unset NODEJS

diff --git a/browser/config/version.txt b/browser/config/version.txt
@@ -1 +1 @@
-125.0a1
+125.0
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
@@ -1 +1 @@
-125.0a1
+125.0b1
diff --git a/config/milestone.txt b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-125.0a1
+125.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ @@
     # hardcoded milestones in the tree from these two files.
     #--------------------------------------------------------
-.0a1
+.0