Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland. a=merge

Browse Source 
CLOSED TREE
This commit is contained in:
Alexandru Michis 2021-12-06 23:55:53 +02:00
commit d8d98946cd
7 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hgtags
View File

@ -221,3 +221,5 @@ b724ec4440e0fec4dd6e02ac019f43b2e0b32f85 FIREFOX_NIGHTLY_90_END
f72751662b4af9b7fafa26fa9efa6a36b11b12a5 FIREFOX_NIGHTLY_94_END
ec54c35cb3bd993fc91f6bd11635b0b0c2229c6a FIREFOX_BETA_95_BASE
1379da0937ff9ae8aff8042fed31103dcd0bf13b FIREFOX_NIGHTLY_95_END
422c7594bf65d1e930d52165356b0098402ff6fe FIREFOX_BETA_96_BASE
9a9e37163d95b8021449260af27a113d4633235c FIREFOX_NIGHTLY_96_END

2
CLOBBER
View File

@ -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.
Bug 1738422 - Update to ICU 70 requires clobber
Merge day clobber

2
browser/config/version.txt
View File

@ -1 +1 @@
96.0a1
97.0a1

2
browser/config/version_display.txt
View File

@ -1 +1 @@
96.0a1
97.0a1

2
config/milestone.txt
View File

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

2
services/sync/modules/constants.js
View File

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

2
xpcom/components/Module.h
View File

@ -21,7 +21,7 @@ namespace mozilla {
* via a module loader.
*/
struct Module {
static const unsigned int kVersion = 96;
static const unsigned int kVersion = 97;
struct CIDEntry;