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/mozapps/webextensions/jar.mn | |
| 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 'toolkit/mozapps/webextensions/jar.mn')
| -rw-r--r-- | toolkit/mozapps/webextensions/jar.mn | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/mozapps/webextensions/jar.mn b/toolkit/mozapps/webextensions/jar.mn index 6da7dc893..0c63396cc 100644 --- a/toolkit/mozapps/webextensions/jar.mn +++ b/toolkit/mozapps/webextensions/jar.mn @@ -13,9 +13,9 @@ toolkit.jar: content/mozapps/extensions/about.xul (../extensions/content/about.xul) content/mozapps/extensions/about.js (content/about.js) content/mozapps/extensions/list.xul (../extensions/content/list.xul) - content/mozapps/extensions/list.js (content/list.js) + content/mozapps/extensions/list.js (../extensions/content/list.js) content/mozapps/extensions/blocklist.xul (../extensions/content/blocklist.xul) - content/mozapps/extensions/blocklist.js (content/blocklist.js) + content/mozapps/extensions/blocklist.js (../extensions/content/blocklist.js) content/mozapps/extensions/blocklist.css (../extensions/content/blocklist.css) content/mozapps/extensions/blocklist.xml (../extensions/content/blocklist.xml) * content/mozapps/extensions/update.xul (content/update.xul) @@ -23,13 +23,13 @@ toolkit.jar: content/mozapps/extensions/eula.xul (../extensions/content/eula.xul) content/mozapps/extensions/eula.js (content/eula.js) content/mozapps/extensions/newaddon.xul (content/newaddon.xul) - content/mozapps/extensions/newaddon.js (content/newaddon.js) +* content/mozapps/extensions/newaddon.js (../extensions/content/newaddon.js) content/mozapps/extensions/pluginPrefs.xul (../extensions/content/pluginPrefs.xul) content/mozapps/extensions/gmpPrefs.xul (../extensions/content/gmpPrefs.xul) content/mozapps/extensions/OpenH264-license.txt (../extensions/content/OpenH264-license.txt) #endif content/mozapps/extensions/setting.xml (content/setting.xml) content/mozapps/xpinstall/xpinstallConfirm.xul (../extensions/content/xpinstallConfirm.xul) - content/mozapps/xpinstall/xpinstallConfirm.js (content/xpinstallConfirm.js) + content/mozapps/xpinstall/xpinstallConfirm.js (../extensions/content/xpinstallConfirm.js) content/mozapps/xpinstall/xpinstallConfirm.css (../extensions/content/xpinstallConfirm.css) content/mozapps/xpinstall/xpinstallItem.xml (../extensions/content/xpinstallItem.xml) |