diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /browser/config/mozconfigs/macosx-universal/l10n-mozconfig | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'browser/config/mozconfigs/macosx-universal/l10n-mozconfig')
| -rw-r--r-- | browser/config/mozconfigs/macosx-universal/l10n-mozconfig | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig b/browser/config/mozconfigs/macosx-universal/l10n-mozconfig deleted file mode 100644 index 80a06ed65..000000000 --- a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig +++ /dev/null @@ -1,22 +0,0 @@ -. "$topsrcdir/browser/config/mozconfigs/common" -. "$topsrcdir/build/macosx/mozconfig.common" - -ac_add_options --with-l10n-base=../../l10n -ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} -ac_add_options --enable-official-branding - -if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then -ac_add_options --with-macbundlename-prefix=Firefox -fi - -export MOZILLA_OFFICIAL=1 - -# Enable Telemetry -export MOZ_TELEMETRY_REPORTING=1 - -# Don't autoclobber l10n, as this can lead to missing binaries and broken builds -# Bug 1283438 -mk_add_options AUTOCLOBBER= - -. "$topsrcdir/build/mozconfig.common.override" -. "$topsrcdir/build/mozconfig.cache" |