From 6458cc3fa4a812451490d33ee128e0e1b4dcb3fe Mon Sep 17 00:00:00 2001
From: Alex Keybl <akeybl@mozilla.com>
Date: Mon, 27 Aug 2012 12:21:46 -0700
Subject: [PATCH] Merging in version bump NO BUG

---
 b2g/confvars.sh             | 2 +-
 browser/config/version.txt  | 2 +-
 config/milestone.txt        | 2 +-
 js/src/config/milestone.txt | 2 +-
 mobile/android/confvars.sh  | 2 +-
 mobile/xul/confvars.sh      | 2 +-
 services/sync/Makefile.in   | 2 +-
 xpcom/components/Module.h   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index 4cfacf4bff0..9e38727451e 100755
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -5,7 +5,7 @@
 MOZ_APP_BASENAME=B2G
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=17.0a1
+MOZ_APP_VERSION=18.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
diff --git a/browser/config/version.txt b/browser/config/version.txt
index ff9866f5f26..3ff4e4f5dac 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-17.0a1
+18.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
index c27812f6866..668818598e1 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-17.0a1
+18.0a1
diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt
index c27812f6866..668818598e1 100644
--- a/js/src/config/milestone.txt
+++ b/js/src/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-17.0a1
+18.0a1
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 4e87f24af39..b211bd332d3 100755
--- 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=17.0a1
+MOZ_APP_VERSION=18.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial
diff --git a/mobile/xul/confvars.sh b/mobile/xul/confvars.sh
index e45615f0f1f..ee7729ca264 100755
--- a/mobile/xul/confvars.sh
+++ b/mobile/xul/confvars.sh
@@ -5,7 +5,7 @@
 MOZ_APP_BASENAME=Fennec
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=17.0a1
+MOZ_APP_VERSION=18.0a1
 
 MOZ_BRANDING_DIRECTORY=mobile/xul/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/xul/branding/official
diff --git a/services/sync/Makefile.in b/services/sync/Makefile.in
index 06795cd8009..04a74b6c55c 100644
--- a/services/sync/Makefile.in
+++ b/services/sync/Makefile.in
@@ -10,7 +10,7 @@ VPATH     := @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # Definitions used by constants.js.
-weave_version := 1.19.0
+weave_version := 1.20.0
 weave_channel := rel
 weave_id      := {340c2bbc-ce74-4362-90b5-7c26312808ef}
 
diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
index 8ef74f05b0b..1415e759523 100644
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -21,7 +21,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 17;
+  static const unsigned int kVersion = 18;
 
   struct CIDEntry;