Merging in version bump NO BUG

This commit is contained in:
Bhavana Bajaj 2013-04-01 11:28:13 -07:00
parent f25765fd46
commit 649bda6e12
7 changed files with 7 additions and 7 deletions

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

@ -5,7 +5,7 @@
MOZ_APP_BASENAME=B2G
MOZ_APP_VENDOR=Mozilla
MOZ_APP_VERSION=22.0a1
MOZ_APP_VERSION=23.0a1
MOZ_APP_UA_NAME=Firefox
MOZ_UA_OS_AGNOSTIC=1

View File

@ -1 +1 @@
22.0a1
23.0a1

View File

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

View File

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

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

@ -5,7 +5,7 @@
MOZ_APP_BASENAME=Fennec
MOZ_APP_VENDOR=Mozilla
MOZ_APP_VERSION=22.0a1
MOZ_APP_VERSION=23.0a1
MOZ_APP_UA_NAME=Firefox
MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial

View File

@ -10,7 +10,7 @@ VPATH := @srcdir@
include $(DEPTH)/config/autoconf.mk
# Definitions used by constants.js.
weave_version := 1.24.0
weave_version := 1.25.0
weave_id := {340c2bbc-ce74-4362-90b5-7c26312808ef}
# Preprocess files.

View File

@ -21,7 +21,7 @@ namespace mozilla {
*/
struct Module
{
static const unsigned int kVersion = 22;
static const unsigned int kVersion = 23;
struct CIDEntry;