equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
3 # Parent 30e1a232528000620a3874de06ea515e5ef8e77f |
3 # Parent fe7e6fdd75484993420740244f21b5b41d6e0fa1 |
4 |
4 |
5 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
5 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
6 --- a/browser/branding/branding-common.mozbuild |
6 --- a/browser/branding/branding-common.mozbuild |
7 +++ b/browser/branding/branding-common.mozbuild |
7 +++ b/browser/branding/branding-common.mozbuild |
8 @@ -22,12 +22,15 @@ def FirefoxBranding(): |
8 @@ -25,12 +25,15 @@ def FirefoxBranding(): |
9 FINAL_TARGET_FILES.VisualElements += [ |
9 'PrivateBrowsing_70.png', |
10 'VisualElements_150.png', |
10 'VisualElements_150.png', |
11 'VisualElements_70.png', |
11 'VisualElements_70.png', |
12 ] |
12 ] |
13 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': |
13 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': |
14 FINAL_TARGET_FILES.chrome.icons.default += [ |
14 FINAL_TARGET_FILES.chrome.icons.default += [ |
22 'default64.png', |
22 'default64.png', |
23 ] |
23 ] |
24 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
24 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
25 --- a/browser/installer/package-manifest.in |
25 --- a/browser/installer/package-manifest.in |
26 +++ b/browser/installer/package-manifest.in |
26 +++ b/browser/installer/package-manifest.in |
27 @@ -236,20 +236,23 @@ |
27 @@ -221,20 +221,23 @@ |
28 @RESPATH@/browser/chrome/browser@JAREXT@ |
28 @RESPATH@/browser/chrome/browser@JAREXT@ |
29 @RESPATH@/browser/chrome/browser.manifest |
29 @RESPATH@/browser/chrome/browser.manifest |
30 @RESPATH@/chrome/pdfjs.manifest |
30 @RESPATH@/chrome/pdfjs.manifest |
31 @RESPATH@/chrome/pdfjs/* |
31 @RESPATH@/chrome/pdfjs/* |
32 @RESPATH@/chrome/toolkit@JAREXT@ |
32 @RESPATH@/chrome/toolkit@JAREXT@ |