Bump the new trunk version to 3.4a1pre, use the unofficial branding on the Miramar branch. a=Standard8 CLOSED TREE
authorMark Banner <bugzilla@standard8.plus.com>
Wed, 23 Mar 2011 14:50:14 +0000
changeset 7410 9a1f4931d53313642f417133e2bc7b57e45f087b
parent 7409 d7730c0ea99caf7f488caa2abbe9bcb3b58530b4
child 7411 6284ebc11965e7fcbf2d4c50f9da3d27f4c69f0f
push idunknown
push userunknown
push dateunknown
reviewersStandard8
Bump the new trunk version to 3.4a1pre, use the unofficial branding on the Miramar branch. a=Standard8 CLOSED TREE
mail/config/version.txt
mail/confvars.sh
--- a/mail/config/version.txt
+++ b/mail/config/version.txt
@@ -1,1 +1,1 @@
-3.3a4pre
+3.4a1pre
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -57,18 +57,17 @@ MOZ_APP_COMPONENT_INCLUDE=nsMailComponen
 
 # Needed for the mozilla-central build side of the system.
 # Can be dropped when we branch MOZILLA_2_0_BRANCH
 MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\).*/\1/;'`
 
 if test "$MOZILLA_BRANCH_VERSION" = "2.0"; then
   MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version-20.txt
   # Use unofficial branding for the 2.0 branch
-  # XXX Use the nightly branding until we actually branch.
-  MOZ_BRANDING_DIRECTORY=mail/branding/nightly
+  MOZ_BRANDING_DIRECTORY=mail/branding/unofficial
 else
   MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
   MOZ_BRANDING_DIRECTORY=mail/branding/nightly
 fi
 
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 THUNDERBIRD_VERSION=$MOZ_APP_VERSION