diff --git a/CLOBBER b/CLOBBER index a09697b63683..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 1717151 - ANGLE update requires clobber +Merge day clobber \ No newline at end of file diff --git a/browser/config/version.txt b/browser/config/version.txt index 5a78231d7392..d0c386db8da5 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -94.0a1 +95.0a1 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 5a78231d7392..d0c386db8da5 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -94.0a1 +95.0a1 diff --git a/config/milestone.txt b/config/milestone.txt index b58ecc03f98a..6b3afbf5f10f 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -94.0a1 +95.0a1 diff --git a/services/sync/modules/constants.js b/services/sync/modules/constants.js index f0daaf59a521..ea06a4546317 100644 --- a/services/sync/modules/constants.js +++ b/services/sync/modules/constants.js @@ -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.96.0", + WEAVE_VERSION: "1.97.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 6e54daed9f59..bf4ed413421f 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 = 94; + static const unsigned int kVersion = 95; struct CIDEntry;