equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent ad0e2fcaa00769bc56cc2b58d1264209f8c32623 |
2 # Parent c2eac57908647987ed11893ad45262a32122dff4 |
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 @@ -132,16 +132,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
7 @@ -134,16 +134,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
8 endif |
8 endif |
9 |
9 |
10 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
10 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
11 libs:: |
11 libs:: |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons |
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 @@ -47,18 +47,21 @@ BRANDING_FILES := \ |
32 @@ -42,18 +42,21 @@ BRANDING_FILES := \ |
33 document.icns \ |
33 document.icns \ |
34 dsstore \ |
34 dsstore \ |
35 $(NULL) |
35 $(NULL) |
36 endif |
36 endif |
37 |
37 |
52 firefox-os2.ico \ |
52 firefox-os2.ico \ |
53 document-os2.ico \ |
53 document-os2.ico \ |
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 @@ -558,18 +558,21 @@ |
57 @@ -572,18 +572,21 @@ |
58 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
|
59 #ifdef SHIP_FEEDBACK |
|
60 @BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi |
58 @BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi |
61 #endif |
59 #endif |
62 @BINPATH@/chrome/toolkit@JAREXT@ |
60 @BINPATH@/chrome/toolkit@JAREXT@ |
63 @BINPATH@/chrome/toolkit.manifest |
61 @BINPATH@/chrome/toolkit.manifest |
|
62 @BINPATH@/chrome/recording.manifest |
|
63 @BINPATH@/chrome/recording/* |
64 #ifdef MOZ_GTK2 |
64 #ifdef MOZ_GTK2 |
65 @BINPATH@/browser/chrome/icons/default/default16.png |
65 @BINPATH@/browser/chrome/icons/default/default16.png |
66 +@BINPATH@/browser/chrome/icons/default/default22.png |
66 +@BINPATH@/browser/chrome/icons/default/default22.png |
67 +@BINPATH@/browser/chrome/icons/default/default24.png |
67 +@BINPATH@/browser/chrome/icons/default/default24.png |
68 @BINPATH@/browser/chrome/icons/default/default32.png |
68 @BINPATH@/browser/chrome/icons/default/default32.png |