forked from mirrors/gecko-dev
Bug 1337748 - Move security-prefs.js from netwerk/ to security/manager/. r=keeler,mcmanus
MozReview-Commit-ID: 2TOJG6tRWJZ --HG-- rename : netwerk/base/security-prefs.js => security/manager/ssl/security-prefs.js extra : rebase_source : e11ef6fa7264edd41e77d65512a2183c737f34dd
This commit is contained in:
parent
18cd648928
commit
448874c0f1
3 changed files with 7 additions and 4 deletions
|
|
@ -186,6 +186,12 @@ mobile/android/components/Snippets.js
|
||||||
# Bug 1178739: Ignore this file as a quick fix for "Illegal yield expression"
|
# Bug 1178739: Ignore this file as a quick fix for "Illegal yield expression"
|
||||||
mobile/android/modules/HomeProvider.jsm
|
mobile/android/modules/HomeProvider.jsm
|
||||||
|
|
||||||
|
# security/ exclusions (pref files).
|
||||||
|
security/manager/ssl/security-prefs.js
|
||||||
|
|
||||||
|
#NSS
|
||||||
|
security/nss/**
|
||||||
|
|
||||||
# services/ exclusions
|
# services/ exclusions
|
||||||
|
|
||||||
# Uses `#filter substitution`
|
# Uses `#filter substitution`
|
||||||
|
|
@ -228,6 +234,3 @@ toolkit/webapps/**
|
||||||
|
|
||||||
# Third party
|
# Third party
|
||||||
toolkit/modules/third_party/**
|
toolkit/modules/third_party/**
|
||||||
|
|
||||||
#NSS
|
|
||||||
security/nss/**
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#include ../../netwerk/base/security-prefs.js
|
#include ../../security/manager/ssl/security-prefs.js
|
||||||
#include init/all.js
|
#include init/all.js
|
||||||
#ifdef MOZ_DATA_REPORTING
|
#ifdef MOZ_DATA_REPORTING
|
||||||
#include ../../toolkit/components/telemetry/datareporting-prefs.js
|
#include ../../toolkit/components/telemetry/datareporting-prefs.js
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue