1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
2 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de |
3 # Parent e10e9bf6ab3a74655998bd0286d248f5d17a601a |
3 # Parent a5764b0a088418fdbf4b774a8ff2745cc99f6706 |
4 |
4 |
5 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
5 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
6 --- a/browser/app/Makefile.in |
6 --- a/browser/app/Makefile.in |
7 +++ b/browser/app/Makefile.in |
7 +++ b/browser/app/Makefile.in |
8 @@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
8 @@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
28 |
28 |
29 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
29 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
30 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
30 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild |
31 --- a/browser/branding/branding-common.mozbuild |
31 --- a/browser/branding/branding-common.mozbuild |
32 +++ b/browser/branding/branding-common.mozbuild |
32 +++ b/browser/branding/branding-common.mozbuild |
33 @@ -32,12 +32,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
33 @@ -34,12 +34,15 @@ def FirefoxBranding(): |
34 'disk.icns', |
34 'disk.icns', |
35 'document.icns', |
35 'document.icns', |
36 'dsstore', |
36 'dsstore', |
37 'firefox.icns', |
37 'firefox.icns', |
38 ] |
38 ] |
39 elif CONFIG['MOZ_WIDGET_GTK']: |
39 elif CONFIG['MOZ_WIDGET_GTK']: |
40 BRANDING_FILES += [ |
40 BRANDING_FILES += [ |
41 'default16.png', |
41 'default16.png', |
42 + 'default22.png', |
42 + 'default22.png', |
43 + 'default24.png', |
43 + 'default24.png', |
44 + 'default256.png', |
44 + 'default256.png', |
45 'default32.png', |
45 'default32.png', |
46 'default48.png', |
46 'default48.png', |
47 'mozicon128.png', |
47 'mozicon128.png', |
48 ] |
48 ] |
49 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
49 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
50 --- a/browser/installer/package-manifest.in |
50 --- a/browser/installer/package-manifest.in |
51 +++ b/browser/installer/package-manifest.in |
51 +++ b/browser/installer/package-manifest.in |
52 @@ -670,18 +670,21 @@ |
52 @@ -664,18 +664,21 @@ |
53 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
53 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
54 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
54 @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
55 @RESPATH@/chrome/toolkit@JAREXT@ |
55 @RESPATH@/chrome/toolkit@JAREXT@ |
56 @RESPATH@/chrome/toolkit.manifest |
56 @RESPATH@/chrome/toolkit.manifest |
57 @RESPATH@/chrome/recording.manifest |
57 @RESPATH@/chrome/recording.manifest |
62 +@RESPATH@/browser/chrome/icons/default/default24.png |
62 +@RESPATH@/browser/chrome/icons/default/default24.png |
63 @RESPATH@/browser/chrome/icons/default/default32.png |
63 @RESPATH@/browser/chrome/icons/default/default32.png |
64 @RESPATH@/browser/chrome/icons/default/default48.png |
64 @RESPATH@/browser/chrome/icons/default/default48.png |
65 +@RESPATH@/browser/chrome/icons/default/default256.png |
65 +@RESPATH@/browser/chrome/icons/default/default256.png |
66 #endif |
66 #endif |
|
67 @RESPATH@/browser/features/* |
67 |
68 |
68 ; [Webide Files] |
69 ; [Webide Files] |
69 @RESPATH@/browser/chrome/webide@JAREXT@ |
70 @RESPATH@/browser/chrome/webide@JAREXT@ |
70 @RESPATH@/browser/chrome/webide.manifest |
71 @RESPATH@/browser/chrome/webide.manifest |
71 @RESPATH@/browser/@PREF_DIR@/webide-prefs.js |
72 @RESPATH@/browser/@PREF_DIR@/webide-prefs.js |
72 |
73 |
73 ; DevTools |
|