Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-cental to autoland. CLOSED TREE

Browse Source
This commit is contained in:
Dorel Luca 2020-06-01 19:35:58 +03:00
commit 61e47c120c
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

@ -181,3 +181,5 @@ f53ecf8eee2a0d2a7705d7ea3ec8682028e922a0 FIREFOX_NIGHTLY_74_END
3cc678e923e6f105437db28740c8223fd4940c8d FIREFOX_NIGHTLY_76_END
200615cdc7c34a7fdfb2f7ffba158dae2cbf49d5 FIREFOX_BETA_77_BASE
5b8406a0446906d7228e5d745549b50a3496dc0f FIREFOX_NIGHTLY_77_END
e4b11f027efc1f8c2710ae3f52487a8f10a8fb39 FIREFOX_BETA_78_BASE
702ad0fa15860f6ea37effdcb45973cc63d3125b FIREFOX_NIGHTLY_78_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 1636389 - Moved a file in NSS, causing stale build state
Merge day clobber

2
browser/config/version.txt
View File

@ -1 +1 @@
78.0a1
79.0a1

2
browser/config/version_display.txt
View File

@ -1 +1 @@
78.0a1
79.0a1

2
config/milestone.txt
View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
78.0a1
79.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.80.0",
WEAVE_VERSION: "1.81.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 = 78;
static const unsigned int kVersion = 79;
struct CIDEntry;