Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
firefox-branded-icons.patch
changeset 294 5330447b83a3
parent 289 3c0dff7ca9c4
child 340 aabcc7895695 
--- a/firefox-branded-icons.patch	Sat Jul 23 15:16:24 2011 +0200
+++ b/firefox-branded-icons.patch	Sat Jul 23 15:31:44 2011 +0200
@@ -1,15 +1,15 @@
 # HG changeset patch
-# Parent 0a9fd1d7099ccdff12205e23f0d9bf4d93a328ee
+# Parent 6948d58326d5c2e46936e186079421e7d76445e2
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -221,16 +221,21 @@ endif
+@@ -199,16 +199,21 @@ DEFINES += -DMOZILLA_OFFICIAL
+ endif
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
  libs::
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
- 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png   $(DIST)/bin/icons
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png  $(DIST)/bin/chrome/icons/default
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png  $(DIST)/bin/chrome/icons/default
  	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png  $(DIST)/bin/chrome/icons/default
@@ -29,7 +29,7 @@
 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
 --- a/browser/branding/official/Makefile.in
 +++ b/browser/branding/official/Makefile.in
-@@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \
+@@ -69,18 +69,21 @@ OSX_BRANDING_FILES = \
  	firefox.icns \
  	disk.icns \
  	document.icns \
@@ -43,7 +43,6 @@
  	default32.png \
  	default48.png \
 +	default256.png \
- 	document.png \
  	mozicon128.png \
  	$(NULL)
  
@@ -51,10 +50,11 @@
  	firefox-os2.ico \
  	document-os2.ico \
  	$(NULL)
+ 
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -416,18 +416,21 @@
+@@ -421,18 +421,21 @@
  #ifdef SHIP_FEEDBACK
  @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
  #endif
mozilla