Version bump to 6.0a1. Merge to mozilla-aurora. r=bsmedberg, a=LegNeato. AURORA_BASE_20110412
authorChristian Legnitto <clegnitto@mozilla.com>
Tue, 12 Apr 2011 06:51:00 -0700
changeset 68025 a95d426422816513477e5863add1b00ac7041dcb
parent 68024 ead2b17ac3cc9fee658b4249a7099ee6380f2f0b
child 68026 238bd74dd39ee0bd7fbab0d0741be1cec098bec1
child 68269 fe8374934c59d46cfdb7a80da59896f97b121e0a
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, LegNeato
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Version bump to 6.0a1. Merge to mozilla-aurora. r=bsmedberg, a=LegNeato.
browser/config/version.txt
config/milestone.txt
js/src/config/milestone.txt
mobile/confvars.sh
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1,1 +1,1 @@
-4.2a1pre
+6.0a1
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -5,9 +5,9 @@
 #    x.x.x.x
 #    x.x.x+
 #
 # Referenced by milestone.pl.
 # Hopefully I'll be able to automate replacement of *all*
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-2.2a1pre
+6.0a1
--- a/js/src/config/milestone.txt
+++ b/js/src/config/milestone.txt
@@ -5,9 +5,9 @@
 #    x.x.x.x
 #    x.x.x+
 #
 # Referenced by milestone.pl.
 # Hopefully I'll be able to automate replacement of *all*
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-2.2a1pre
+6.0a1
--- a/mobile/confvars.sh
+++ b/mobile/confvars.sh
@@ -33,17 +33,17 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=fennec
 MOZ_APP_UA_NAME=Fennec
 
-MOZ_APP_VERSION=4.1a1pre
+MOZ_APP_VERSION=6.0a1
 
 MOZ_BRANDING_DIRECTORY=mobile/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_SERVICES_SYNC=1
 
 MOZ_ENABLE_LIBXUL=1