summaryrefslogtreecommitdiffstats
path: root/browser
diff options
context:
space:
mode:
authorJustOff <Off.Just.Off@gmail.com>2018-04-14 19:18:40 +0300
committerJustOff <Off.Just.Off@gmail.com>2018-04-14 19:18:40 +0300
commit01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125 (patch)
tree69438df6a5406510ead01d5406872a9ca0ee1122 /browser
parent25370b7f0cc8709821acc8b7826c2c6e38268c67 (diff)
parent64204fdb8302c8bf483d724430dd83f43c1cb6ff (diff)
downloadUXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.gz
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.lz
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.xz
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP and resolve conflicts
Diffstat (limited to 'browser')
-rw-r--r--browser/components/moz.build5
1 files changed, 1 insertions, 4 deletions
diff --git a/browser/components/moz.build b/browser/components/moz.build
index 0393b6e92..a49580200 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -37,11 +37,8 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'browsercompsbase'
-EXTRA_PP_COMPONENTS += [
- 'BrowserComponents.manifest',
-]
-
EXTRA_COMPONENTS += [
+ 'BrowserComponents.manifest',
'nsBrowserContentHandler.js',
'nsBrowserGlue.js',
]