equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent ab6659ccbfbbfed31bce1bcd696a820069b9d7c0 |
2 # Parent 9745e5d5cdc7e91dbfc5582b49881668cb6725f7 |
3 |
3 |
4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
4 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in |
5 --- a/browser/app/Makefile.in |
5 --- a/browser/app/Makefile.in |
6 +++ b/browser/app/Makefile.in |
6 +++ b/browser/app/Makefile.in |
7 @@ -76,16 +76,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
7 @@ -76,16 +76,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
27 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
27 # channel-prefs.js is handled separate from other prefs due to bug 756325 |
28 libs:: $(srcdir)/profile/channel-prefs.js |
28 libs:: $(srcdir)/profile/channel-prefs.js |
29 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in |
29 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in |
30 --- a/browser/branding/official/Makefile.in |
30 --- a/browser/branding/official/Makefile.in |
31 +++ b/browser/branding/official/Makefile.in |
31 +++ b/browser/branding/official/Makefile.in |
32 @@ -36,18 +36,21 @@ BRANDING_FILES := \ |
32 @@ -35,18 +35,21 @@ BRANDING_FILES := \ |
33 document.icns \ |
33 document.icns \ |
34 dsstore \ |
34 dsstore \ |
35 $(NULL) |
35 $(NULL) |
36 endif |
36 endif |
37 |
37 |
38 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
38 ifdef MOZ_WIDGET_GTK |
39 BRANDING_FILES := \ |
39 BRANDING_FILES := \ |
40 default16.png \ |
40 default16.png \ |
41 + default22.png \ |
41 + default22.png \ |
42 + default24.png \ |
42 + default24.png \ |
43 default32.png \ |
43 default32.png \ |
52 INSTALL_TARGETS += BRANDING |
52 INSTALL_TARGETS += BRANDING |
53 |
53 |
54 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
54 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
55 --- a/browser/installer/package-manifest.in |
55 --- a/browser/installer/package-manifest.in |
56 +++ b/browser/installer/package-manifest.in |
56 +++ b/browser/installer/package-manifest.in |
57 @@ -611,18 +611,21 @@ |
57 @@ -613,18 +613,21 @@ |
58 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
58 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf |
59 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
59 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
60 @BINPATH@/chrome/toolkit@JAREXT@ |
60 @BINPATH@/chrome/toolkit@JAREXT@ |
61 @BINPATH@/chrome/toolkit.manifest |
61 @BINPATH@/chrome/toolkit.manifest |
62 @BINPATH@/chrome/recording.manifest |
62 @BINPATH@/chrome/recording.manifest |