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/base/content/global-scripts.inc | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-fc61780b35af913801d72086456f493f63197da6.tar UXP-fc61780b35af913801d72086456f493f63197da6.tar.gz UXP-fc61780b35af913801d72086456f493f63197da6.tar.lz UXP-fc61780b35af913801d72086456f493f63197da6.tar.xz UXP-fc61780b35af913801d72086456f493f63197da6.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'browser/base/content/global-scripts.inc')
| -rwxr-xr-x | browser/base/content/global-scripts.inc | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/browser/base/content/global-scripts.inc b/browser/base/content/global-scripts.inc deleted file mode 100755 index eef21e15e..000000000 --- a/browser/base/content/global-scripts.inc +++ /dev/null @@ -1,39 +0,0 @@ -# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -# 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/. - -<script type="application/javascript" src="chrome://global/content/printUtils.js"/> -<script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/> -<script type="application/javascript" src="chrome://browser/content/places/browserPlacesViews.js"/> -<script type="application/javascript" src="chrome://browser/content/browser.js"/> -<script type="application/javascript" src="chrome://browser/content/customizableui/panelUI.js"/> -<script type="application/javascript" src="chrome://global/content/viewSourceUtils.js"/> - -<script type="application/javascript" src="chrome://browser/content/browser-addons.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-captivePortal.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-ctrlTab.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-customization.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-devedition.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-feeds.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-fullScreenAndPointerLock.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-fullZoom.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-gestureSupport.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-media.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-places.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-plugins.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-refreshblocker.js"/> -#ifdef MOZ_SAFE_BROWSING -<script type="application/javascript" src="chrome://browser/content/browser-safebrowsing.js"/> -#endif -<script type="application/javascript" src="chrome://browser/content/browser-sidebar.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-syncui.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-tabsintitlebar.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-thumbnails.js"/> -<script type="application/javascript" src="chrome://browser/content/browser-trackingprotection.js"/> - -#ifdef MOZ_DATA_REPORTING -<script type="application/javascript" src="chrome://browser/content/browser-data-submission-info-bar.js"/> -#endif - -<script type="application/javascript" src="chrome://browser/content/browser-fxaccounts.js"/> |