From 1abebb1cb7d2340e4824cda13835a458a6215319 Mon Sep 17 00:00:00 2001
From: Lukas Blakk <lsblakk@mozilla.com>
Date: Tue, 13 Mar 2012 13:38:38 -0700
Subject: [PATCH] Merging in version bump NO BUG

---
 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 +-
 xpcom/components/Module.h   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/browser/config/version.txt b/browser/config/version.txt
index d4157f8df4848..644225a35f36c 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-13.0a1
+14.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
index f780391e9db59..17f7a63fad30e 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-13.0a1
+14.0a1
diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt
index f780391e9db59..17f7a63fad30e 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.
 #--------------------------------------------------------
 
-13.0a1
+14.0a1
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 1de42e51365ed..0709cf005d98b 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -38,7 +38,7 @@
 MOZ_APP_BASENAME=Fennec
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=13.0a1
+MOZ_APP_VERSION=14.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 53f1f3b3da291..84034c69d0ab1 100644
--- a/mobile/xul/confvars.sh
+++ b/mobile/xul/confvars.sh
@@ -38,7 +38,7 @@
 MOZ_APP_BASENAME=Fennec
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=13.0a1
+MOZ_APP_VERSION=14.0a1
 
 MOZ_BRANDING_DIRECTORY=mobile/xul/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/xul/branding/official
diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
index 4501daa756f4d..091294f2039c9 100644
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -53,7 +53,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 13;
+  static const unsigned int kVersion = 14;
 
   struct CIDEntry;