equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
3 # Parent 2bffb52e07b587a6c755d67c6fc971fed6509783 |
3 # Parent 6309c3625e39216f9cf5a7a35cbf6932adfabc1d |
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 @@ -34,18 +34,24 @@ def FirefoxBranding(): |
8 @@ -41,18 +41,24 @@ def FirefoxBranding(): |
9 'disk.icns', |
9 'disk.icns', |
10 'document.icns', |
10 'document.icns', |
11 'dsstore', |
11 'dsstore', |
12 'firefox.icns', |
12 'firefox.icns', |
13 ] |
13 ] |
31 'default48.png', |
31 'default48.png', |
32 ] |
32 ] |
33 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
33 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
34 --- a/browser/installer/package-manifest.in |
34 --- a/browser/installer/package-manifest.in |
35 +++ b/browser/installer/package-manifest.in |
35 +++ b/browser/installer/package-manifest.in |
36 @@ -650,18 +650,21 @@ |
36 @@ -599,18 +599,21 @@ |
37 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
37 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest |
38 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
38 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
39 @RESPATH@/chrome/toolkit@JAREXT@ |
39 @RESPATH@/chrome/toolkit@JAREXT@ |
40 @RESPATH@/chrome/toolkit.manifest |
40 @RESPATH@/chrome/toolkit.manifest |
41 @RESPATH@/chrome/recording.manifest |
41 @RESPATH@/chrome/recording.manifest |
42 @RESPATH@/chrome/recording/* |
42 @RESPATH@/chrome/recording/* |