diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-11 19:16:22 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-11 19:16:22 +0100 |
| commit | 06a13ffb09108b55aaeee03f20f8231a8826dda8 (patch) | |
| tree | 1495efc36dbf159ea0d380875bdd653da54129f0 /browser/installer | |
| parent | 3954c1a773f7d94f2baf506d4814bab56fd70f49 (diff) | |
| parent | 3bcc6548c41f96878c8d0e0c8efe8632fcce16ba (diff) | |
| download | UXP-06a13ffb09108b55aaeee03f20f8231a8826dda8.tar UXP-06a13ffb09108b55aaeee03f20f8231a8826dda8.tar.gz UXP-06a13ffb09108b55aaeee03f20f8231a8826dda8.tar.lz UXP-06a13ffb09108b55aaeee03f20f8231a8826dda8.tar.xz UXP-06a13ffb09108b55aaeee03f20f8231a8826dda8.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'browser/installer')
| -rw-r--r-- | browser/installer/allowed-dupes.mn | 8 | ||||
| -rw-r--r-- | browser/installer/package-manifest.in | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index 2ea55aff4..366842598 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -202,9 +202,17 @@ chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png chrome/toolkit/skin/classic/mozapps/extensions/category-experiments.png chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.png +chrome/toolkit/skin/classic/mozapps/extensions/category-themes.png +chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.png +chrome/toolkit/skin/classic/mozapps/extensions/category-languages.png +chrome/toolkit/skin/classic/mozapps/extensions/localeGeneric.png +chrome/toolkit/skin/classic/mozapps/extensions/category-extensions.png +chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.png chrome/toolkit/skin/classic/mozapps/update/buttons.png chrome/toolkit/skin/classic/mozapps/update/downloadButtons-XP.png chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png +chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png + components/FxAccountsPush.js crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index ba7904719..bddca2f29 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -417,10 +417,14 @@ @RESPATH@/components/addonManager.js @RESPATH@/components/amContentHandler.js @RESPATH@/components/amInstallTrigger.js +#ifdef MOZ_WEBEXTENSIONS @RESPATH@/components/amWebAPI.js +#endif @RESPATH@/components/amWebInstallListener.js @RESPATH@/components/nsBlocklistService.js +#ifdef MOZ_WEBEXTENSIONS @RESPATH@/components/nsBlocklistServiceContent.js +#endif #ifdef MOZ_UPDATER @RESPATH@/components/nsUpdateService.manifest @RESPATH@/components/nsUpdateService.js @@ -569,9 +573,11 @@ @RESPATH@/components/TestInterfaceJSMaplike.js #endif +#ifdef MOZ_WEBEXTENSIONS ; [Extensions] @RESPATH@/components/extensions-toolkit.manifest @RESPATH@/browser/components/extensions-browser.manifest +#endif ; Modules @RESPATH@/browser/modules/* |