equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
3 # Parent 38e46d7f98d3e392de95d83660ecd147b30dc9aa |
3 # Parent 8a401a01454e9f5e8a357262d774e0ff348d9bc1 |
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 @@ -17,12 +17,15 @@ def FirefoxBranding(): |
8 @@ -22,12 +22,15 @@ def FirefoxBranding(): |
9 FINAL_TARGET_FILES.VisualElements += [ |
9 FINAL_TARGET_FILES.VisualElements += [ |
10 'VisualElements_150.png', |
10 'VisualElements_150.png', |
11 'VisualElements_70.png', |
11 'VisualElements_70.png', |
12 ] |
12 ] |
13 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
13 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
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 @@ -601,20 +601,23 @@ |
27 @@ -404,20 +404,23 @@ |
28 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest |
28 @RESPATH@/browser/chrome/pdfjs.manifest |
29 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
29 @RESPATH@/browser/chrome/pdfjs/* |
30 @RESPATH@/chrome/toolkit@JAREXT@ |
30 @RESPATH@/chrome/toolkit@JAREXT@ |
31 @RESPATH@/chrome/toolkit.manifest |
31 @RESPATH@/chrome/toolkit.manifest |
32 @RESPATH@/chrome/recording.manifest |
32 @RESPATH@/chrome/recording.manifest |
33 @RESPATH@/chrome/recording/* |
33 @RESPATH@/chrome/recording/* |
34 #ifdef MOZ_GTK |
34 #ifdef MOZ_GTK |
44 @RESPATH@/browser/features/* |
44 @RESPATH@/browser/features/* |
45 |
45 |
46 ; [Webide Files] |
46 ; [Webide Files] |
47 @RESPATH@/browser/chrome/webide@JAREXT@ |
47 @RESPATH@/browser/chrome/webide@JAREXT@ |
48 @RESPATH@/browser/chrome/webide.manifest |
48 @RESPATH@/browser/chrome/webide.manifest |
49 @RESPATH@/browser/@PREF_DIR@/webide-prefs.js |
49 @RESPATH@/browser/@PREF_DIR@/webide.js |
50 |
50 |