diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:38:55 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-18 10:38:55 +0100 |
commit | 5839763c827cc35973e419026f926e9b8ffc118d (patch) | |
tree | 11fd29c791adc491430a7a9b516224c2a724868e /docshell/base/moz.build | |
parent | 83c4b04a70d2319d4c292e7aa0c8872e7c1cd7fa (diff) | |
parent | 45f2fcd80d2a7d536e8b486c18415a337b56cb46 (diff) | |
download | UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.gz UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.lz UXP-5839763c827cc35973e419026f926e9b8ffc118d.tar.xz UXP-5839763c827cc35973e419026f926e9b8ffc118d.zip |
Merge branch 'master' into ported-moebius
# Conflicts:
# browser/installer/windows/nsis/stub.nsi
Diffstat (limited to 'docshell/base/moz.build')
-rw-r--r-- | docshell/base/moz.build | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docshell/base/moz.build b/docshell/base/moz.build index 1eb04c227..6ea3e6d28 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -81,8 +81,5 @@ LOCAL_INCLUDES += [ if CONFIG['MOZ_TOOLKIT_SEARCH']: DEFINES['MOZ_TOOLKIT_SEARCH'] = True -if CONFIG['MOZ_DEVTOOLS'] == 'all': - DEFINES['MOZ_DEVTOOLS_ALL'] = True - if CONFIG['GNU_CXX']: CXXFLAGS += ['-Wno-error=shadow'] |