equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent ab9210b3779914924d12de5a3952d4cc52cd9d78 |
2 # Parent 716c063a34dc33046c36b49e3bd2b4ec867d2b5b |
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 @@ -133,16 +133,21 @@ endif |
7 @@ -131,16 +131,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d |
8 endif #} LIBXUL_SDK |
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 |
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default |
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default |
52 $(NULL) |
52 $(NULL) |
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 @@ -541,18 +541,21 @@ |
57 @@ -552,18 +552,21 @@ |
58 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
58 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png |
59 #ifdef SHIP_FEEDBACK |
59 #ifdef SHIP_FEEDBACK |
60 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
60 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
61 #endif |
61 #endif |
62 @BINPATH@/chrome/toolkit@JAREXT@ |
62 @BINPATH@/chrome/toolkit@JAREXT@ |