diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 12:47:12 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 12:47:12 +0100 |
| commit | 8240fb9c736f91044cabbdde8c537b179fc4921e (patch) | |
| tree | 49a4cc8dc683cf955d61b6618ad471860554ccb5 /tools | |
| parent | f9e04b54c2ccbc1f8e24b511003de09b4565193c (diff) | |
| parent | 5c83a18cde404b5c0c9fba1d35f003d951ea32e2 (diff) | |
| download | UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.gz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.lz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.xz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lint/eslint/modules.json | 1 | ||||
| -rw-r--r-- | tools/rewriting/ThirdPartyPaths.txt | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tools/lint/eslint/modules.json b/tools/lint/eslint/modules.json index 5fb645762..767b43db0 100644 --- a/tools/lint/eslint/modules.json +++ b/tools/lint/eslint/modules.json @@ -224,7 +224,6 @@ "tokenserverclient.js": ["TokenServerClient", "TokenServerClientError", "TokenServerClientNetworkError", "TokenServerClientServerError"], "ToolboxProcess.jsm": ["BrowserToolboxProcess"], "tps.jsm": ["ACTIONS", "TPS"], - "Translation.jsm": ["Translation", "TranslationTelemetry"], "Traversal.jsm": ["TraversalRules", "TraversalHelper"], "UpdateTelemetry.jsm": ["AUSTLMY"], "userapi.js": ["UserAPI10Client"], diff --git a/tools/rewriting/ThirdPartyPaths.txt b/tools/rewriting/ThirdPartyPaths.txt index a5822c981..e784566de 100644 --- a/tools/rewriting/ThirdPartyPaths.txt +++ b/tools/rewriting/ThirdPartyPaths.txt @@ -56,6 +56,7 @@ netwerk/srtp/src/ nsprpub/ other-licenses/ security/sandbox/chromium/ +third_party/aom/ testing/gtest/gmock/ testing/gtest/gtest/ toolkit/components/protobuf/ |