Merging in version bump NO BUG

7fa7186c · Lukas Blakk · 9d4b0e1f · 7fa7186c · 7fa7186c · 7fa7186c
Commit 7fa7186c authored 12 years ago by Lukas Blakk
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -5,7 +5,7 @@
 MOZ_APP_BASENAME=B2G
 MOZ_APP_VENDOR=Mozilla

-MOZ_APP_VERSION=15.0a1
+MOZ_APP_VERSION=16.0a1
 MOZ_APP_UA_NAME=Firefox

 MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial

--- a/browser/config/version.txt
+++ b/browser/config/version.txt
-15.0a1
+16.0a1
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------

-15.0a1
+16.0a1
--- 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.
 #--------------------------------------------------------

-15.0a1
+16.0a1
--- 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=15.0a1
+MOZ_APP_VERSION=16.0a1
 MOZ_APP_UA_NAME=Firefox

 MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial

--- 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=15.0a1
+MOZ_APP_VERSION=16.0a1

 MOZ_BRANDING_DIRECTORY=mobile/xul/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/xul/branding/official

--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -21,7 +21,7 @@ namespace mozilla {
 */
 struct Module
 {
-  static const unsigned int kVersion = 15;
+  static const unsigned int kVersion = 16;

  struct CIDEntry;