author | ffxbld <release@mozilla.com> |
Mon, 21 Jul 2014 14:19:15 -0700 | |
changeset 195311 | 5b64c42742cd36761a5cd89342282fe0bb480d4a |
parent 195310 | bab6e7dff3d57d024b24828cf2bd5e2775338f1c |
child 195331 | 8113cde4e947adbb951defb5517b42a8d76196f8 |
push id | 27175 |
push user | asasaki@mozilla.com |
push date | Mon, 21 Jul 2014 21:19:32 +0000 |
treeherder | mozilla-central@5b64c42742cd [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | release |
milestone | 34.0a1 |
first release with | nightly linux32
5b64c42742cd
/
34.0a1
/
20140721153228
/
files
nightly linux64
5b64c42742cd
/
34.0a1
/
20140721153228
/
files
nightly mac
5b64c42742cd
/
34.0a1
/
20140721153228
/
files
nightly win32
5b64c42742cd
/
34.0a1
/
20140721153228
/
files
nightly win64
5b64c42742cd
/
34.0a1
/
20140721153228
/
files
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly linux32
34.0a1
/
20140721153228
/
pushlog to previous
nightly linux64
34.0a1
/
20140721153228
/
pushlog to previous
nightly mac
34.0a1
/
20140721153228
/
pushlog to previous
nightly win32
34.0a1
/
20140721153228
/
pushlog to previous
nightly win64
34.0a1
/
20140721153228
/
pushlog to previous
|
--- a/CLOBBER +++ b/CLOBBER @@ -17,9 +17,9 @@ # # 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. -Clobber to work around bug 959928. +Merge day clobber \ No newline at end of file
--- a/b2g/confvars.sh +++ b/b2g/confvars.sh @@ -1,16 +1,16 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOZ_APP_BASENAME=B2G MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=33.0a1 +MOZ_APP_VERSION=34.0a1 MOZ_APP_UA_NAME=Firefox MOZ_UA_OS_AGNOSTIC=1 MOZ_B2G_VERSION=2.1.0.0-prerelease MOZ_B2G_OS_NAME=Boot2Gecko MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
--- a/config/milestone.txt +++ b/config/milestone.txt @@ -5,9 +5,9 @@ # x.x.x.x # x.x.x+ # # Referenced by milestone.pl. # Hopefully I'll be able to automate replacement of *all* # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -33.0a1 +34.0a1
--- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -1,16 +1,16 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOZ_APP_BASENAME=Fennec MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=33.0a1 +MOZ_APP_VERSION=34.0a1 MOZ_APP_UA_NAME=Firefox MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official # MOZ_APP_DISPLAYNAME is set by branding/configure.sh MOZ_SAFE_BROWSING=1
--- a/services/sync/Makefile.in +++ b/services/sync/Makefile.in @@ -1,14 +1,14 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Definitions used by constants.js. -weave_version := 1.35.0 +weave_version := 1.36.0 weave_id := {340c2bbc-ce74-4362-90b5-7c26312808ef} # Preprocess files. SYNC_PP := modules/constants.js SYNC_PP_FLAGS := \ -Dweave_version=$(weave_version) \ -Dweave_id='$(weave_id)' SYNC_PP_PATH = $(FINAL_TARGET)/modules/services-sync
--- a/xpcom/components/Module.h +++ b/xpcom/components/Module.h @@ -16,17 +16,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 = 33; + static const unsigned int kVersion = 34; struct CIDEntry; typedef already_AddRefed<nsIFactory> (*GetFactoryProcPtr) (const Module& module, const CIDEntry& entry); typedef nsresult (*ConstructorProcPtr)(nsISupports* aOuter, const nsIID& aIID,