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 /browser/tools/mozscreenshots/controlCenter | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'browser/tools/mozscreenshots/controlCenter')
| -rw-r--r-- | browser/tools/mozscreenshots/controlCenter/browser.ini | 6 | ||||
| -rw-r--r-- | browser/tools/mozscreenshots/controlCenter/browser_controlCenter.js | 16 |
2 files changed, 0 insertions, 22 deletions
diff --git a/browser/tools/mozscreenshots/controlCenter/browser.ini b/browser/tools/mozscreenshots/controlCenter/browser.ini deleted file mode 100644 index f5b084edc..000000000 --- a/browser/tools/mozscreenshots/controlCenter/browser.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -subsuite = screenshots -support-files = - ../head.js - -[browser_controlCenter.js] diff --git a/browser/tools/mozscreenshots/controlCenter/browser_controlCenter.js b/browser/tools/mozscreenshots/controlCenter/browser_controlCenter.js deleted file mode 100644 index 7e1ffb125..000000000 --- a/browser/tools/mozscreenshots/controlCenter/browser_controlCenter.js +++ /dev/null @@ -1,16 +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/. */ - -/* import-globals-from ../head.js */ - -"use strict"; - -add_task(function* capture() { - if (!shouldCapture()) { - return; - } - let sets = ["LightweightThemes", "ControlCenter"]; - - yield TestRunner.start(sets, "controlCenter"); -}); |