From 2eb3b6566da7f3724f9da240ef5e05e259d82ef1 Mon Sep 17 00:00:00 2001 From: ffxbld Date: Mon, 2 Dec 2019 11:59:11 +0000 Subject: [PATCH] Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release --- CLOBBER | 2 +- browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- config/milestone.txt | 2 +- services/sync/modules/constants.js | 2 +- xpcom/components/Module.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CLOBBER b/CLOBBER index 6ad6bb37cf83..d4cdfaff33de 100644 --- 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. -Bug 1583269 - Update to ICU 65 requires clobber +Merge day clobber \ No newline at end of file diff --git a/browser/config/version.txt b/browser/config/version.txt index 40f90c38b4a4..2a55b3b2af06 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -72.0a1 +73.0a1 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 40f90c38b4a4..2a55b3b2af06 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -72.0a1 +73.0a1 diff --git a/config/milestone.txt b/config/milestone.txt index 55a637ece916..382196177433 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -72.0a1 +73.0a1 diff --git a/services/sync/modules/constants.js b/services/sync/modules/constants.js index 5d87f90a6f23..94915ccfd870 100644 --- a/services/sync/modules/constants.js +++ b/services/sync/modules/constants.js @@ -8,7 +8,7 @@ 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.74.0", +WEAVE_VERSION: "1.75.0", // Sync Server API version that the client supports. SYNC_API_VERSION: "1.5", diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h index 7e8294105675..927ff85155e4 100644 --- a/xpcom/components/Module.h +++ b/xpcom/components/Module.h @@ -21,7 +21,7 @@ namespace mozilla { * via a module loader. */ struct Module { - static const unsigned int kVersion = 72; + static const unsigned int kVersion = 73; struct CIDEntry;