diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-01-06 15:14:54 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-01-06 15:14:54 +0100 |
| commit | cc6a935ce54b573c1efd7533aff00e7bf0a9959c (patch) | |
| tree | c8ad266edb7ea1e7b93aaaaa98847cf662373668 /build/moz.configure | |
| parent | d129c900c9f943adb69c1fb20ba1a029fdd95cff (diff) | |
| parent | 9f4afc2552a67cc675b8b8af2ecb8ebc04a473a7 (diff) | |
| download | UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar.gz UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar.lz UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.tar.xz UXP-cc6a935ce54b573c1efd7533aff00e7bf0a9959c.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/components/feeds/FeedWriter.js
# application/palemoon/config/version.txt
# security/manager/ssl/nsSTSPreloadList.errors
# security/manager/ssl/nsSTSPreloadList.inc
Diffstat (limited to 'build/moz.configure')
| -rw-r--r-- | build/moz.configure/old.configure | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index e6eaa8228..59dc8b57b 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -157,7 +157,6 @@ def old_configure_options(*options): '--enable-accessibility', '--enable-address-sanitizer', '--enable-alsa', - '--enable-android-omx', '--enable-b2g-bt', '--enable-b2g-camera', '--enable-b2g-ril', @@ -206,7 +205,6 @@ def old_configure_options(*options): '--enable-nspr-build', '--enable-official-branding', '--enable-official-vendor', - '--enable-omx-plugin', '--enable-oom-breakpoint', '--enable-optimize', '--enable-parental-controls', @@ -309,6 +307,10 @@ def old_configure_options(*options): '--enable-calendar', '--enable-incomplete-external-linkage', + # Below are configure flags used by Pale Moon + '--disable-browser-statusbar', + '--disable-sync', + # Below are configure flags used by Basilisk '--disable-webextensions', ) |