Merging in version bump NO BUG a=relman

Brli · Apr 24, 2012 · 8b0dd2e · 8b0dd2e
1 parent fa1ae62
commit 8b0dd2e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/b2g/confvars.sh b/b2g/confvars.sh
@@ -38,7 +38,7 @@
 MOZ_APP_BASENAME=B2G
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=14.0a1
+MOZ_APP_VERSION=15.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial

diff --git a/browser/config/version.txt b/browser/config/version.txt
@@ -1 +1 @@
-14.0a1
+15.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-14.0a1
+15.0a1
diff --git 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.
 #--------------------------------------------------------
 
-14.0a1
+15.0a1
diff --git 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=14.0a1
+MOZ_APP_VERSION=15.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
@@ -38,7 +38,7 @@
 MOZ_APP_BASENAME=Fennec
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=14.0a1
+MOZ_APP_VERSION=15.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
@@ -53,7 +53,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 14;
+  static const unsigned int kVersion = 15;
 
   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