equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
3 # Parent fe8ed2b997914bef9446d854a4c189fb69394bac |
3 # Parent 30e1a232528000620a3874de06ea515e5ef8e77f |
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 @@ -22,12 +22,15 @@ def FirefoxBranding(): |
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 @@ -252,20 +252,23 @@ |
27 @@ -236,20 +236,23 @@ |
|
28 @RESPATH@/browser/chrome/browser@JAREXT@ |
|
29 @RESPATH@/browser/chrome/browser.manifest |
28 @RESPATH@/chrome/pdfjs.manifest |
30 @RESPATH@/chrome/pdfjs.manifest |
29 @RESPATH@/chrome/pdfjs/* |
31 @RESPATH@/chrome/pdfjs/* |
30 @RESPATH@/chrome/toolkit@JAREXT@ |
32 @RESPATH@/chrome/toolkit@JAREXT@ |
31 @RESPATH@/chrome/toolkit.manifest |
33 @RESPATH@/chrome/toolkit.manifest |
32 @RESPATH@/chrome/recording.manifest |
|
33 @RESPATH@/chrome/recording/* |
|
34 #ifdef MOZ_GTK |
34 #ifdef MOZ_GTK |
35 @RESPATH@/browser/chrome/icons/default/default16.png |
35 @RESPATH@/browser/chrome/icons/default/default16.png |
36 +@RESPATH@/browser/chrome/icons/default/default22.png |
36 +@RESPATH@/browser/chrome/icons/default/default22.png |
37 +@RESPATH@/browser/chrome/icons/default/default24.png |
37 +@RESPATH@/browser/chrome/icons/default/default24.png |
38 @RESPATH@/browser/chrome/icons/default/default32.png |
38 @RESPATH@/browser/chrome/icons/default/default32.png |