summaryrefslogtreecommitdiffstats
path: root/browser/base/jar.mn
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-11 07:03:16 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-11 07:03:16 -0500
commit203eb0f61a09372310a2a8fb57e169cb3f47800b (patch)
tree8490329d3dae4de3c7ffd127bce1f65fdc009abd /browser/base/jar.mn
parente45706ca3acbb6530419433212becc61d5953a2d (diff)
parent8f6d3dab81c7f8f97ef197e26ab9439b09735b8f (diff)
downloadUXP-FF_Checkpoint_1.tar
UXP-FF_Checkpoint_1.tar.gz
UXP-FF_Checkpoint_1.tar.lz
UXP-FF_Checkpoint_1.tar.xz
UXP-FF_Checkpoint_1.zip
Merge branch 'ext-work'FF_Checkpoint_1
Diffstat (limited to 'browser/base/jar.mn')
-rw-r--r--browser/base/jar.mn4
1 files changed, 2 insertions, 2 deletions
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 38b103c43..c9dbbbb9f 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -99,7 +99,7 @@ browser.jar:
#endif
content/browser/browser-thumbnails.js (content/browser-thumbnails.js)
content/browser/browser-trackingprotection.js (content/browser-trackingprotection.js)
- content/browser/tab-content.js (content/tab-content.js)
+* content/browser/tab-content.js (content/tab-content.js)
content/browser/content.js (content/content.js)
content/browser/social-content.js (content/social-content.js)
content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg)
@@ -166,7 +166,7 @@ browser.jar:
content/browser/contentSearchUI.css (content/contentSearchUI.css)
content/browser/tabbrowser.css (content/tabbrowser.css)
content/browser/tabbrowser.xml (content/tabbrowser.xml)
- content/browser/urlbarBindings.xml (content/urlbarBindings.xml)
+* content/browser/urlbarBindings.xml (content/urlbarBindings.xml)
content/browser/utilityOverlay.js (content/utilityOverlay.js)
content/browser/usercontext.svg (content/usercontext.svg)
content/browser/web-panels.js (content/web-panels.js)