Merge mozilla-central to autoland. a=merge CLOSED TREE

This commit is contained in:
Noemi Erli 2023-02-13 19:14:05 +02:00
commit fe45307bf1
6 changed files with 7 additions and 7 deletions

View file

@ -253,3 +253,5 @@ e6f125e02b6f887336e466a4b69fbb5a81c5f313 FIREFOX_BETA_109_BASE
c52e7b297e0f4d0cf588e488f08492a240d29322 FIREFOX_NIGHTLY_109_END c52e7b297e0f4d0cf588e488f08492a240d29322 FIREFOX_NIGHTLY_109_END
36ca6ab936799a65a43aacb4ee1040ffd01af0df FIREFOX_BETA_110_BASE 36ca6ab936799a65a43aacb4ee1040ffd01af0df FIREFOX_BETA_110_BASE
5bf22e58549c4b36d2087500236a764d1aa6f368 FIREFOX_NIGHTLY_110_END 5bf22e58549c4b36d2087500236a764d1aa6f368 FIREFOX_NIGHTLY_110_END
d561ece0b43bb36217b8eb8920395c05bc03fd9e FIREFOX_BETA_111_BASE
936d17fd83ca2497225995193a49bfe425739135 FIREFOX_NIGHTLY_111_END

View file

@ -22,7 +22,5 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please # changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more. # don't change CLOBBER for WebIDL changes any more.
A recent ANGLE vendoring update from <https://bugzilla.mozilla.org/show_bug.cgi?id=1753349> causes
a failure like the following:
Modified build files in third_party/libwebrtc - Bug 1806510 - Vendor libwebrtc from c898c82884 Merge day clobber 2023-02-13

View file

@ -1 +1 @@
111.0a1 112.0a1

View file

@ -1 +1 @@
111.0a1 112.0a1

View file

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files. # hardcoded milestones in the tree from these two files.
#-------------------------------------------------------- #--------------------------------------------------------
111.0a1 112.0a1

View file

@ -7,7 +7,7 @@ var EXPORTED_SYMBOLS = [];
for (let [key, val] of Object.entries({ for (let [key, val] of Object.entries({
// Don't manually modify this line, as it is automatically replaced on merge day // Don't manually modify this line, as it is automatically replaced on merge day
// by the gecko_migration.py script. // by the gecko_migration.py script.
WEAVE_VERSION: "1.113.0", WEAVE_VERSION: "1.114.0",
// Sync Server API version that the client supports. // Sync Server API version that the client supports.
SYNC_API_VERSION: "1.5", SYNC_API_VERSION: "1.5",