Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
authorffxbld <release@mozilla.com>
Mon, 25 Jan 2016 09:01:00 -0500
changeset 281480 3f41d7d0f544ebd98273e39bd945c28878a47427
parent 281479 a2a6201322ad1cd09202b53b9c2cbf40b26026ee
child 281481 bd8bb6298d90770f97843e9d7dc711cc0f87d02f
push idunknown
push userunknown
push dateunknown
reviewersrelease
milestone47.0a1
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
CLOBBER
browser/config/version.txt
browser/config/version_display.txt
config/milestone.txt
services/sync/moz.build
xpcom/components/Module.h
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,10 +17,10 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1240627 - Enable AVX2 optimizations in ffvpx on Mac
 
+Merge day clobber
\ No newline at end of file
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1,1 +1,1 @@
-46.0a1
+47.0a1
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1,1 +1,1 @@
-46.0a1
+47.0a1
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -5,9 +5,9 @@
 #    x.x.x.x
 #    x.x.x+
 #
 # Referenced by milestone.py.
 # Hopefully I'll be able to automate replacement of *all*
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-46.0a1
+47.0a1
--- a/services/sync/moz.build
+++ b/services/sync/moz.build
@@ -37,17 +37,17 @@ EXTRA_JS_MODULES['services-sync'] += [
     'modules/util.js',
 ]
 
 EXTRA_PP_JS_MODULES['services-sync'] += [
     'modules/constants.js',
 ]
 
 # Definitions used by constants.js
-DEFINES['weave_version'] = '1.48.0'
+DEFINES['weave_version'] = '1.49.0'
 DEFINES['weave_id'] = '{340c2bbc-ce74-4362-90b5-7c26312808ef}'
 
 EXTRA_JS_MODULES['services-sync'].engines += [
     'modules/engines/addons.js',
     'modules/engines/bookmarks.js',
     'modules/engines/clients.js',
     'modules/engines/forms.js',
     'modules/engines/history.js',
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -17,17 +17,17 @@ namespace mozilla {
 /**
  * A module implements one or more XPCOM components. This structure is used
  * for both binary and script modules, but the registration members
  * (cids/contractids/categoryentries) are unused for modules which are loaded
  * via a module loader.
  */
 struct Module
 {
-  static const unsigned int kVersion = 46;
+  static const unsigned int kVersion = 47;
 
   struct CIDEntry;
 
   typedef already_AddRefed<nsIFactory> (*GetFactoryProcPtr)(
     const Module& module, const CIDEntry& entry);
 
   typedef nsresult (*ConstructorProcPtr)(nsISupports* aOuter,
                                          const nsIID& aIID,