1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 20b50e5bd650d19c30c308bb3b10f9903c83f581 |
2 # Parent 0a9fd1d7099ccdff12205e23f0d9bf4d93a328ee |
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 @@ -277,16 +277,21 @@ endif |
7 @@ -221,16 +221,21 @@ endif |
8 |
8 |
9 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
9 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) |
10 libs:: |
10 libs:: |
11 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons |
11 $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons |
12 $(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons |
24 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) |
24 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) |
25 libs:: |
25 libs:: |
26 $(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin |
26 $(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin |
27 endif |
27 endif |
28 endif |
28 endif |
29 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
29 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in |
30 --- a/browser/installer/package-manifest.in |
30 --- a/browser/branding/official/Makefile.in |
31 +++ b/browser/installer/package-manifest.in |
31 +++ b/browser/branding/official/Makefile.in |
32 @@ -423,18 +423,21 @@ |
|
33 #ifdef SHIP_FEEDBACK |
|
34 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
|
35 #endif |
|
36 @BINPATH@/chrome/toolkit@JAREXT@ |
|
37 @BINPATH@/chrome/toolkit.manifest |
|
38 #ifdef XP_UNIX |
|
39 #ifndef XP_MACOSX |
|
40 @BINPATH@/chrome/icons/default/default16.png |
|
41 +@BINPATH@/chrome/icons/default/default22.png |
|
42 +@BINPATH@/chrome/icons/default/default24.png |
|
43 @BINPATH@/chrome/icons/default/default32.png |
|
44 @BINPATH@/chrome/icons/default/default48.png |
|
45 +@BINPATH@/chrome/icons/default/default256.png |
|
46 #endif |
|
47 #endif |
|
48 |
|
49 |
|
50 ; shell icons |
|
51 #ifdef XP_UNIX |
|
52 #ifndef XP_MACOSX |
|
53 @BINPATH@/icons/*.xpm |
|
54 diff --git a/other-licenses/branding/firefox/Makefile.in b/other-licenses/branding/firefox/Makefile.in |
|
55 --- a/other-licenses/branding/firefox/Makefile.in |
|
56 +++ b/other-licenses/branding/firefox/Makefile.in |
|
57 @@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \ |
32 @@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \ |
58 firefox.icns \ |
33 firefox.icns \ |
59 disk.icns \ |
34 disk.icns \ |
60 document.icns \ |
35 document.icns \ |
61 dsstore \ |
36 dsstore \ |
74 |
49 |
75 OS2_BRANDING_FILES = \ |
50 OS2_BRANDING_FILES = \ |
76 firefox-os2.ico \ |
51 firefox-os2.ico \ |
77 document-os2.ico \ |
52 document-os2.ico \ |
78 $(NULL) |
53 $(NULL) |
|
54 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
|
55 --- a/browser/installer/package-manifest.in |
|
56 +++ b/browser/installer/package-manifest.in |
|
57 @@ -416,18 +416,21 @@ |
|
58 #ifdef SHIP_FEEDBACK |
|
59 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi |
|
60 #endif |
|
61 @BINPATH@/chrome/toolkit@JAREXT@ |
|
62 @BINPATH@/chrome/toolkit.manifest |
|
63 #ifdef XP_UNIX |
|
64 #ifndef XP_MACOSX |
|
65 @BINPATH@/chrome/icons/default/default16.png |
|
66 +@BINPATH@/chrome/icons/default/default22.png |
|
67 +@BINPATH@/chrome/icons/default/default24.png |
|
68 @BINPATH@/chrome/icons/default/default32.png |
|
69 @BINPATH@/chrome/icons/default/default48.png |
|
70 +@BINPATH@/chrome/icons/default/default256.png |
|
71 #endif |
|
72 #endif |
|
73 |
|
74 |
|
75 ; shell icons |
|
76 #ifdef XP_UNIX |
|
77 #ifndef XP_MACOSX |
|
78 @BINPATH@/icons/*.xpm |