Bug 1193941 - Update merge scripts. r=nthomas. DONTBUILD
authorRail Aliiev <rail@mozilla.com>
Fri, 14 Aug 2015 12:38:31 -0400
changeset 285367 e4d93d205e27f83c9319a73970b25ce00fe14044
parent 285366 b79dc959cde097ced5cbc46349a765ea1b485361
child 285368 09dd35dd11936001b61960819db7d55c6f3e9dc0
child 285409 5f2d07e6f367a169233df2fc91f864ddbfcb28ae
push id4416
push userbgrinstead@mozilla.com
push dateFri, 14 Aug 2015 21:17:52 +0000
reviewersnthomas
bugs1193941
milestone43.0a1
Bug 1193941 - Update merge scripts. r=nthomas. DONTBUILD
testing/mozharness/configs/merge_day/central_to_aurora.py
--- a/testing/mozharness/configs/merge_day/central_to_aurora.py
+++ b/testing/mozharness/configs/merge_day/central_to_aurora.py
@@ -46,16 +46,19 @@ config = {
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora"),
         ("browser/confvars.sh",
          "MAR_CHANNEL_ID=firefox-mozilla-central",
          "MAR_CHANNEL_ID=firefox-mozilla-aurora"),
         ("browser/config/mozconfigs/macosx-universal/nightly",
          "ac_add_options --with-branding=browser/branding/nightly",
          "ac_add_options --with-branding=browser/branding/aurora"),
+        ("browser/config/mozconfigs/macosx-universal/l10n-mozconfig",
+         "ac_add_options --with-branding=browser/branding/nightly",
+         "ac_add_options --with-branding=browser/branding/aurora"),
         ("browser/config/mozconfigs/whitelist",
          "ac_add_options --with-branding=browser/branding/nightly",
          "ac_add_options --with-branding=browser/branding/aurora"),
     ],
     "locale_files": [
         "browser/locales/shipped-locales",
         "browser/locales/all-locales",
         "mobile/android/locales/maemo-locales",