diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /toolkit/content/jar.mn | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'toolkit/content/jar.mn')
| -rw-r--r-- | toolkit/content/jar.mn | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 5a940679b..8b7b35b61 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -19,10 +19,8 @@ toolkit.jar: #endif content/global/aboutNetworking.js content/global/aboutNetworking.xhtml -#ifndef ANDROID - content/global/aboutProfiles.js +* content/global/aboutProfiles.js content/global/aboutProfiles.xhtml -#endif content/global/aboutServiceWorkers.js content/global/aboutServiceWorkers.xhtml #ifdef MOZ_WEBRTC @@ -41,9 +39,9 @@ toolkit.jar: content/global/browser-child.js content/global/browser-content.js * content/global/buildconfig.html - content/global/contentAreaUtils.js +* content/global/contentAreaUtils.js content/global/customizeToolbar.css - content/global/customizeToolbar.js +* content/global/customizeToolbar.js content/global/customizeToolbar.xul content/global/datepicker.xhtml content/global/editMenuOverlay.js @@ -52,7 +50,7 @@ toolkit.jar: * content/global/finddialog.xul content/global/findUtils.js content/global/filepicker.properties - content/global/globalOverlay.js +* content/global/globalOverlay.js content/global/mozilla.xhtml #ifdef MOZ_PHOENIX content/global/logopage.xhtml |