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

… ba=release
Brli · Oct 13, 2014 · 840f394 · 840f394
1 parent 41ef519
commit 840f394
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git 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 1080922 - Removal of a test manifest that the build system isn't picking up.
+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=35.0a1
+MOZ_APP_VERSION=36.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 @@
-35.0a1
+36.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-35.0a1
+36.0a1
diff --git 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=35.0a1
+MOZ_APP_VERSION=36.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
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Definitions used by constants.js.
-weave_version := 1.37.0
+weave_version := 1.38.0
 weave_id      := {340c2bbc-ce74-4362-90b5-7c26312808ef}
 
 # Preprocess files.

diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
@@ -21,7 +21,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 35;
+  static const unsigned int kVersion = 36;
 
   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