Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

39 files changed, 0 insertions, 48 deletions

diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png
deleted file mode 100644
index 295b4ad74..000000000
--- a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png
deleted file mode 100644
index 23889d7cc..000000000
--- a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png
deleted file mode 100644
index 4d71308d2..000000000
--- a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
deleted file mode 100644
index 875f73c5e..000000000
--- a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png b/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png
deleted file mode 100644
index 94a11fe5f..000000000
--- a/browser/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/newtab-inverted.png b/browser/themes/osx/tabbrowser/newtab-inverted.png
deleted file mode 100644
index 2d29c2cbe..000000000
--- a/browser/themes/osx/tabbrowser/newtab-inverted.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/newtab-inverted@2x.png b/browser/themes/osx/tabbrowser/newtab-inverted@2x.png
deleted file mode 100644
index 6feba0e83..000000000
--- a/browser/themes/osx/tabbrowser/newtab-inverted@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/newtab.png b/browser/themes/osx/tabbrowser/newtab.png
deleted file mode 100644
index 32e42b04c..000000000
--- a/browser/themes/osx/tabbrowser/newtab.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/newtab@2x.png b/browser/themes/osx/tabbrowser/newtab@2x.png
deleted file mode 100644
index ffde5f050..000000000
--- a/browser/themes/osx/tabbrowser/newtab@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png b/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png
deleted file mode 100644
index 9f74c4e76..000000000
--- a/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png b/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png
deleted file mode 100644
index 50961db7e..000000000
--- a/browser/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle.png b/browser/themes/osx/tabbrowser/tab-active-middle.png
deleted file mode 100644
index c3e5e18ba..000000000
--- a/browser/themes/osx/tabbrowser/tab-active-middle.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-active-middle@2x.png b/browser/themes/osx/tabbrowser/tab-active-middle@2x.png
deleted file mode 100644
index 6cdc4472e..000000000
--- a/browser/themes/osx/tabbrowser/tab-active-middle@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left-inverted.png b/browser/themes/osx/tabbrowser/tab-arrow-left-inverted.png
deleted file mode 100644
index b0826024d..000000000
--- a/browser/themes/osx/tabbrowser/tab-arrow-left-inverted.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png b/browser/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png
deleted file mode 100644
index 4ca8ec0ba..000000000
--- a/browser/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left.png b/browser/themes/osx/tabbrowser/tab-arrow-left.png
deleted file mode 100644
index 61ad41ae9..000000000
--- a/browser/themes/osx/tabbrowser/tab-arrow-left.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-left@2x.png b/browser/themes/osx/tabbrowser/tab-arrow-left@2x.png
deleted file mode 100644
index 20bf78db2..000000000
--- a/browser/themes/osx/tabbrowser/tab-arrow-left@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right-inverted.png b/browser/themes/osx/tabbrowser/tab-arrow-right-inverted.png
deleted file mode 100644
index 0cd8f37a6..000000000
--- a/browser/themes/osx/tabbrowser/tab-arrow-right-inverted.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png b/browser/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png
deleted file mode 100644
index e4ab8cbaa..000000000
--- a/browser/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right.png b/browser/themes/osx/tabbrowser/tab-arrow-right.png
deleted file mode 100644
index 37ccf8cfe..000000000
--- a/browser/themes/osx/tabbrowser/tab-arrow-right.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-arrow-right@2x.png b/browser/themes/osx/tabbrowser/tab-arrow-right@2x.png
deleted file mode 100644
index d319accc5..000000000
--- a/browser/themes/osx/tabbrowser/tab-arrow-right@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-background-end.png b/browser/themes/osx/tabbrowser/tab-background-end.png
deleted file mode 100644
index 2e515a39e..000000000
--- a/browser/themes/osx/tabbrowser/tab-background-end.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-background-end@2x.png b/browser/themes/osx/tabbrowser/tab-background-end@2x.png
deleted file mode 100644
index 18dba9693..000000000
--- a/browser/themes/osx/tabbrowser/tab-background-end@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-background-middle.png b/browser/themes/osx/tabbrowser/tab-background-middle.png
deleted file mode 100644
index addb64b13..000000000
--- a/browser/themes/osx/tabbrowser/tab-background-middle.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-background-middle@2x.png b/browser/themes/osx/tabbrowser/tab-background-middle@2x.png
deleted file mode 100644
index 41eba94af..000000000
--- a/browser/themes/osx/tabbrowser/tab-background-middle@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-background-start.png b/browser/themes/osx/tabbrowser/tab-background-start.png
deleted file mode 100644
index 243bf0099..000000000
--- a/browser/themes/osx/tabbrowser/tab-background-start.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-background-start@2x.png b/browser/themes/osx/tabbrowser/tab-background-start@2x.png
deleted file mode 100644
index 86403921d..000000000
--- a/browser/themes/osx/tabbrowser/tab-background-start@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg b/browser/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg
deleted file mode 100644
index decefab6e..000000000
--- a/browser/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="30px" height="31px" preserveAspectRatio="none">
-  <defs>
-    <style>
-      #tab-background-fill {
-        background-color: transparent;
-        background-image: linear-gradient(transparent, transparent 2px, hsl(0,0%,99%) 2px, hsl(0,0%,97%));
-        background-repeat: no-repeat;
-        height: 100%;
-        width: 100%;
-      }
-    </style>
-
-    <clipPath id="tab-curve-clip-path-end" clipPathUnits="objectBoundingBox">
-      <path d="m 0,0.0625 -0.05,0 0,0.938 1,0 0,-0.028 C 0.67917542,0.95840561 0.56569036,0.81970962 0.51599998,0.5625 0.48279998,0.3905 0.465,0.0659 0,0.0625 z"/>
-    </clipPath>
-  </defs>
-
-  <foreignObject width="30" height="31" clip-path="url(#tab-curve-clip-path-end)">
-    <div id="tab-background-fill" xmlns="http://www.w3.org/1999/xhtml"></div>
-  </foreignObject>
-</svg>
diff --git a/browser/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg b/browser/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg
deleted file mode 100644
index e29bab297..000000000
--- a/browser/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="30px" height="31px" preserveAspectRatio="none">
-  <defs>
-    <style>
-      #tab-background-fill {
-        background-color: transparent;
-        background-image: linear-gradient(transparent, transparent 2px, hsl(0,0%,99%) 2px, hsl(0,0%,97%));
-        background-repeat: no-repeat;
-        height: 100%;
-        width: 100%;
-      }
-    </style>
-
-    <clipPath id="tab-curve-clip-path-start" clipPathUnits="objectBoundingBox">
-      <path d="m 1,0.0625 0.05,0 0,0.938 -1,0 0,-0.028 C 0.32082458,0.95840561 0.4353096,0.81970962 0.48499998,0.5625 0.51819998,0.3905 0.535,0.0659 1,0.0625 z"/>
-    </clipPath>
-  </defs>
-
-  <foreignObject width="30" height="31" clip-path="url(#tab-curve-clip-path-start)">
-    <div id="tab-background-fill" xmlns="http://www.w3.org/1999/xhtml"></div>
-  </foreignObject>
-</svg>
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png b/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png
deleted file mode 100644
index 4206f0c7d..000000000
--- a/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png
deleted file mode 100644
index 21ac89270..000000000
--- a/browser/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end.png b/browser/themes/osx/tabbrowser/tab-stroke-end.png
deleted file mode 100755
index 099978580..000000000
--- a/browser/themes/osx/tabbrowser/tab-stroke-end.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png
deleted file mode 100644
index d321ca579..000000000
--- a/browser/themes/osx/tabbrowser/tab-stroke-end@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png b/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png
deleted file mode 100644
index 2acbac438..000000000
--- a/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png
deleted file mode 100644
index a12fc39a7..000000000
--- a/browser/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start.png b/browser/themes/osx/tabbrowser/tab-stroke-start.png
deleted file mode 100755
index e5a7b5ee9..000000000
--- a/browser/themes/osx/tabbrowser/tab-stroke-start.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png b/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png
deleted file mode 100644
index 64449115c..000000000
--- a/browser/themes/osx/tabbrowser/tab-stroke-start@2x.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tabDragIndicator.png b/browser/themes/osx/tabbrowser/tabDragIndicator.png
deleted file mode 100644
index a373cae53..000000000
--- a/browser/themes/osx/tabbrowser/tabDragIndicator.png
+++ /dev/null
diff --git a/browser/themes/osx/tabbrowser/tabDragIndicator@2x.png b/browser/themes/osx/tabbrowser/tabDragIndicator@2x.png
deleted file mode 100644
index b51b873cb..000000000
--- a/browser/themes/osx/tabbrowser/tabDragIndicator@2x.png
+++ /dev/null