diff --git a/CLOBBER b/CLOBBER index ab48dbb4964..d4cdfaff33d 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 1155494 seems to need a clobber to pick up a change the ipdl parser. +Merge day clobber \ No newline at end of file diff --git a/b2g/confvars.sh b/b2g/confvars.sh index 00d14c87ad2..1bfb9c75eb7 100644 --- a/b2g/confvars.sh +++ b/b2g/confvars.sh @@ -5,7 +5,7 @@ MOZ_APP_BASENAME=B2G MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=40.0a1 +MOZ_APP_VERSION=41.0a1 MOZ_APP_UA_NAME=Firefox MOZ_UA_OS_AGNOSTIC=1 diff --git a/browser/config/version.txt b/browser/config/version.txt index 5d63a2b3ba5..288a167298d 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -40.0a1 +41.0a1 diff --git a/config/milestone.txt b/config/milestone.txt index 5ca2a075bb6..9cb4865049d 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -40.0a1 +41.0a1 diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index da1ed1ecb63..dba5f3893bb 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -5,7 +5,7 @@ MOZ_APP_BASENAME=Fennec MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=40.0a1 +MOZ_APP_VERSION=41.0a1 MOZ_APP_UA_NAME=Firefox MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial diff --git a/services/sync/Makefile.in b/services/sync/Makefile.in index 042872ed4b0..ccdabab9511 100644 --- a/services/sync/Makefile.in +++ b/services/sync/Makefile.in @@ -3,7 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Definitions used by constants.js. -weave_version := 1.42.0 +weave_version := 1.43.0 weave_id := {340c2bbc-ce74-4362-90b5-7c26312808ef} # Preprocess files. diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h index ea5081ad887..fb2b3931f8d 100644 --- a/xpcom/components/Module.h +++ b/xpcom/components/Module.h @@ -22,7 +22,7 @@ namespace mozilla { */ struct Module { - static const unsigned int kVersion = 40; + static const unsigned int kVersion = 41; struct CIDEntry;