Merging in version bump NO BUG

This commit is contained in:
Alex Keybl 2012-08-27 12:21:46 -07:00
parent dd5be69de9
commit 6458cc3fa4
8 changed files with 8 additions and 8 deletions

View File

@ -5,7 +5,7 @@
MOZ_APP_BASENAME=B2G
MOZ_APP_VENDOR=Mozilla
MOZ_APP_VERSION=17.0a1
MOZ_APP_VERSION=18.0a1
MOZ_APP_UA_NAME=Firefox
MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial

View File

@ -1 +1 @@
17.0a1
18.0a1

View File

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

View File

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

View File

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

View File

@ -5,7 +5,7 @@
MOZ_APP_BASENAME=Fennec
MOZ_APP_VENDOR=Mozilla
MOZ_APP_VERSION=17.0a1
MOZ_APP_VERSION=18.0a1
MOZ_BRANDING_DIRECTORY=mobile/xul/branding/unofficial
MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/xul/branding/official

View File

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

View File

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