equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 87462739809ad0f41fd335f9a68203fd70f9883c |
2 # Parent efffa19fa0b2530d2aca1ebd5b885a6fc68e51de |
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 @@ -194,16 +194,21 @@ DEFINES += -DMOZILLA_OFFICIAL |
7 @@ -169,16 +169,21 @@ endif # LIBXUL_SDK |
8 endif |
8 DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" |
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 @@ -415,18 +415,21 @@ |
57 @@ -424,18 +424,21 @@ |
58 #ifdef SHIP_FEEDBACK |
58 #ifdef SHIP_FEEDBACK |
59 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
59 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
60 #endif |
60 #endif |
61 @BINPATH@/chrome/toolkit@JAREXT@ |
61 @BINPATH@/chrome/toolkit@JAREXT@ |
62 @BINPATH@/chrome/toolkit.manifest |
62 @BINPATH@/chrome/toolkit.manifest |