equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 33dfbc62844ac4883fbedb77d782a1b9ef5596c4 |
2 # Parent 20b50e5bd650d19c30c308bb3b10f9903c83f581 |
|
3 |
3 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 |
4 --- a/browser/app/Makefile.in |
5 --- a/browser/app/Makefile.in |
5 +++ b/browser/app/Makefile.in |
6 +++ b/browser/app/Makefile.in |
6 @@ -281,16 +281,21 @@ endif |
7 @@ -277,16 +277,21 @@ endif |
7 |
8 |
8 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
9 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
9 libs:: |
10 libs:: |
10 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons |
11 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons |
11 $(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons |
27 endif |
28 endif |
28 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
29 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
29 --- a/browser/installer/package-manifest.in |
30 --- a/browser/installer/package-manifest.in |
30 +++ b/browser/installer/package-manifest.in |
31 +++ b/browser/installer/package-manifest.in |
31 @@ -423,18 +423,21 @@ |
32 @@ -423,18 +423,21 @@ |
32 #if MOZ_UPDATE_CHANNEL == beta |
33 #ifdef SHIP_FEEDBACK |
33 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
34 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
34 #endif |
35 #endif |
35 @BINPATH@/chrome/toolkit@JAREXT@ |
36 @BINPATH@/chrome/toolkit@JAREXT@ |
36 @BINPATH@/chrome/toolkit.manifest |
37 @BINPATH@/chrome/toolkit.manifest |
37 #ifdef XP_UNIX |
38 #ifdef XP_UNIX |