equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 4a29f791f190ebb5de41590d70d52c7510d9477c |
2 # Parent cb004c79ce12bac3db93e34909cc979f2eecab4b |
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 @@ -160,16 +160,21 @@ endif |
7 @@ -161,16 +161,21 @@ endif |
8 endif # LIBXUL_SDK |
8 endif #} LIBXUL_SDK |
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 $(DIST)/bin/icons |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons |
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default |
13 $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/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 @@ -450,18 +450,21 @@ |
57 @@ -478,18 +478,21 @@ |
58 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png |
58 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.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@ |