Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release…

… ba=release
dothq · Jun 25, 2018 · 499488f · 499488f
1 parent b7bdc7b
commit 499488f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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 1459785 - ANGLE update; moved files require clobber due to bug 1421146.
+Merge day clobber
diff --git a/browser/config/version.txt b/browser/config/version.txt
@@ -1 +1 @@
-62.0a1
+63.0a1
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
@@ -1 +1 @@
-62.0a1
+63.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-62.0a1
+63.0a1
diff --git 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.64.0",
+WEAVE_VERSION: "1.65.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
@@ -22,7 +22,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 62;
+  static const unsigned int kVersion = 63;
 
   struct CIDEntry;
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ @@
     # hardcoded milestones in the tree from these two files.
     #--------------------------------------------------------
-.0a1
+.0a1