Merging in version bump NO BUG a=relman

This commit is contained in:
Lukas Blakk 2012-04-24 12:54:16 -04:00
parent 4735754d7e
commit d7f942d541
7 changed files with 7 additions and 7 deletions

2
b2g/confvars.sh Normal file → Executable file
View File

@ -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

View File

@ -1 +1 @@
14.0a1
15.0a1

View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
14.0a1
15.0a1

View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
14.0a1
15.0a1

2
mobile/android/confvars.sh Normal file → Executable file
View File

@ -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

2
mobile/xul/confvars.sh Normal file → Executable file
View File

@ -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

View File

@ -53,7 +53,7 @@ namespace mozilla {
*/
struct Module
{
static const unsigned int kVersion = 14;
static const unsigned int kVersion = 15;
struct CIDEntry;