diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /toolkit/content/jar.mn | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.gz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.lz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.xz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'toolkit/content/jar.mn')
| -rw-r--r-- | toolkit/content/jar.mn | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index f0d4a62a4..e1d432cb3 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -8,14 +8,14 @@ toolkit.jar: content/global/textbox.css content/global/menulist.css content/global/autocomplete.css - content/global/about.js +* content/global/about.js content/global/about.xhtml content/global/aboutAbout.js content/global/aboutAbout.xhtml -#ifdef MC_OFFICIAL - content/global/aboutRights.xhtml +#ifdef MOZ_OFFICIAL_BRANDING +* content/global/aboutRights.xhtml #else - content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml) +* content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml) #endif content/global/aboutNetworking.js content/global/aboutNetworking.xhtml @@ -25,9 +25,11 @@ toolkit.jar: #endif content/global/aboutServiceWorkers.js content/global/aboutServiceWorkers.xhtml +#ifdef MOZ_WEBRTC content/global/aboutwebrtc/aboutWebrtc.css (aboutwebrtc/aboutWebrtc.css) content/global/aboutwebrtc/aboutWebrtc.js (aboutwebrtc/aboutWebrtc.js) content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html) +#endif * content/global/aboutSupport.js * content/global/aboutSupport.xhtml content/global/aboutTelemetry.js @@ -38,7 +40,7 @@ toolkit.jar: content/global/plugins.css content/global/browser-child.js content/global/browser-content.js -* content/global/buildconfig.html +* content/global/buildconfig.html content/global/contentAreaUtils.js #ifndef MOZ_FENNEC content/global/customizeToolbar.css @@ -55,8 +57,6 @@ toolkit.jar: #endif content/global/filepicker.properties content/global/globalOverlay.js - content/global/memoriam.xhtml -* content/global/mozilla.css content/global/mozilla.xhtml #ifdef MOZ_PHOENIX content/global/logopage.xhtml |