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

… ba=release
Brli · Dec 14, 2015 · ca39cac · ca39cac
1 parent 2578e24
commit ca39cac
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/CLOBBER b/CLOBBER
@@ -22,5 +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 1210165 - Update ICU to release 56.1.
-Bug 966038 - Updating ICU doesn't properly notify the Mozilla build system, necessitating a clobber.
+Merge day clobber
diff --git a/b2g/confvars.sh b/b2g/confvars.sh
@@ -5,7 +5,7 @@
 MOZ_APP_BASENAME=B2G
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=45.0a1
+MOZ_APP_VERSION=46.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_UA_OS_AGNOSTIC=1

diff --git a/browser/config/version.txt b/browser/config/version.txt
@@ -1 +1 @@
-45.0a1
+46.0a1
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
@@ -1 +1 @@
-45.0a1
+46.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-45.0a1
+46.0a1
diff --git a/services/sync/moz.build b/services/sync/moz.build
@@ -46,7 +46,7 @@ EXTRA_PP_JS_MODULES['services-sync'] += [
 ]
 
 # Definitions used by constants.js
-DEFINES['weave_version'] = '1.47.0'
+DEFINES['weave_version'] = '1.48.0'
 DEFINES['weave_id'] = '{340c2bbc-ce74-4362-90b5-7c26312808ef}'
 
 EXTRA_JS_MODULES['services-sync'].engines += [

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 = 45;
+  static const unsigned int kVersion = 46;
 
   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