From 15412c0bcf2f49d996b23c818a033ffca3fe6168 Mon Sep 17 00:00:00 2001
From: ffxbld <release@mozilla.com>
Date: Mon, 21 Jul 2014 14:19:15 -0700
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 +-
 config/milestone.txt       | 2 +-
 mobile/android/confvars.sh | 2 +-
 services/sync/Makefile.in  | 2 +-
 xpcom/components/Module.h  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CLOBBER b/CLOBBER
index 4c1c664b68c..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.
 
-Clobber to work around bug 959928.
+Merge day clobber
\ No newline at end of file
diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index 817ccd3838a..f77d791fb0d 100644
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -5,7 +5,7 @@
 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
diff --git a/browser/config/version.txt b/browser/config/version.txt
index 540ef4dda30..bb12bf2e22b 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-33.0a1
+34.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
index a4cfd2e6b3f..1c88b7abded 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-33.0a1
+34.0a1
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 7677c559a26..c7d3afe5698 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=33.0a1
+MOZ_APP_VERSION=34.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 a040adbb7a2..4ccc503eb01 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.35.0
+weave_version := 1.36.0
 weave_id      := {340c2bbc-ce74-4362-90b5-7c26312808ef}
 
 # Preprocess files.
diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
index e20fc39cfc7..d2f3127f2e0 100644
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -21,7 +21,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 33;
+  static const unsigned int kVersion = 34;
 
   struct CIDEntry;