From 875e811e5883a2fc5fd1d4b4ccd15e81d7146f69 Mon Sep 17 00:00:00 2001 From: ffxbld Date: Mon, 21 Sep 2015 10:15:23 -0400 Subject: [PATCH] Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release --- CLOBBER | 2 +- b2g/confvars.sh | 2 +- browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- config/milestone.txt | 2 +- services/sync/moz.build | 2 +- xpcom/components/Module.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CLOBBER b/CLOBBER index ef4bae595c4e..d4cdfaff33de 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 1201224 - stop unifying test package during mac universal builds needed a CLOBBER +Merge day clobber \ No newline at end of file diff --git a/b2g/confvars.sh b/b2g/confvars.sh index f99640a4e8b9..5631d223a777 100644 --- a/b2g/confvars.sh +++ b/b2g/confvars.sh @@ -5,7 +5,7 @@ MOZ_APP_BASENAME=B2G MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=43.0a1 +MOZ_APP_VERSION=44.0a1 MOZ_APP_UA_NAME=Firefox MOZ_UA_OS_AGNOSTIC=1 diff --git a/browser/config/version.txt b/browser/config/version.txt index 9b3bb9c0d32e..1376b0be3aa7 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -43.0a1 +44.0a1 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 9b3bb9c0d32e..1376b0be3aa7 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -43.0a1 +44.0a1 diff --git a/config/milestone.txt b/config/milestone.txt index 4bc0400327a7..674456471144 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -43.0a1 +44.0a1 diff --git a/services/sync/moz.build b/services/sync/moz.build index 7abfbc4a63c1..5886d339865c 100644 --- 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.45.0' +DEFINES['weave_version'] = '1.46.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 index 5078e9058a49..d1e8fd044a62 100644 --- a/xpcom/components/Module.h +++ b/xpcom/components/Module.h @@ -22,7 +22,7 @@ namespace mozilla { */ struct Module { - static const unsigned int kVersion = 43; + static const unsigned int kVersion = 44; struct CIDEntry;