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/win64/beta | |
| 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/win64/beta')
| -rw-r--r-- | browser/config/mozconfigs/win64/beta | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/browser/config/mozconfigs/win64/beta b/browser/config/mozconfigs/win64/beta deleted file mode 100644 index 6fc4ebe36..000000000 --- a/browser/config/mozconfigs/win64/beta +++ /dev/null @@ -1,19 +0,0 @@ -MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1} - -if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then - MOZ_AUTOMATION_UPLOAD_SYMBOLS=1 - MOZ_AUTOMATION_UPDATE_PACKAGING=1 -fi - -. "$topsrcdir/build/mozconfig.win-common" -. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" -. "$topsrcdir/browser/config/mozconfigs/win64/common-opt" - -mk_add_options MOZ_PGO=1 - -ac_add_options --enable-official-branding -ac_add_options --enable-verify-mar - -. "$topsrcdir/build/mozconfig.rust" - -. "$topsrcdir/build/mozconfig.common.override" |