From 7771d631c4b387eb542d1eb590106d57ce91c69a Mon Sep 17 00:00:00 2001 From: Bhavana Bajaj Date: Mon, 1 Apr 2013 11:51:31 -0700 Subject: [PATCH] Merging in version bump NO BUG CLOSED TREE --- b2g/confvars.sh | 2 +- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- mobile/android/confvars.sh | 2 +- mobile/xul/confvars.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) mode change 100755 => 100644 b2g/confvars.sh mode change 100755 => 100644 mobile/android/confvars.sh diff --git a/b2g/confvars.sh b/b2g/confvars.sh old mode 100755 new mode 100644 index 00c4605511aa..b4ecfdca6c84 --- a/b2g/confvars.sh +++ b/b2g/confvars.sh @@ -5,7 +5,7 @@ MOZ_APP_BASENAME=B2G MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=21.0a2 +MOZ_APP_VERSION=21.0 MOZ_APP_UA_NAME=Firefox MOZ_UA_OS_AGNOSTIC=1 diff --git a/browser/config/version.txt b/browser/config/version.txt index 77d826cec115..5f39e9144690 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -21.0a2 +21.0 diff --git a/config/milestone.txt b/config/milestone.txt index 741e5ace2e31..7d5cfff5236c 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -21.0a2 +21.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index 741e5ace2e31..7d5cfff5236c 100644 --- 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. #-------------------------------------------------------- -21.0a2 +21.0 diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh old mode 100755 new mode 100644 index 5a7cc2004626..94cef85bb070 --- 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=21.0a2 +MOZ_APP_VERSION=21.0 MOZ_APP_UA_NAME=Firefox MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial diff --git a/mobile/xul/confvars.sh b/mobile/xul/confvars.sh index 0b58c8204a8c..e95ee1a04ff1 100755 --- 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=21.0a2 +MOZ_APP_VERSION=21.0 MOZ_BRANDING_DIRECTORY=mobile/xul/branding/unofficial MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/xul/branding/official