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 484 62b8d7fa9144
parent 467 a9baaad57fa4
child 568 2c74c5927ea2 
--- a/firefox-branded-icons.patch	Tue Jun 19 10:12:39 2012 +0200
+++ b/firefox-branded-icons.patch	Tue Jun 19 10:13:07 2012 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 8e4bf8e8a79138350231e03dc567d893f67b2a29
+# Parent 7272ee3a4df832b885fec122f02d32f23dcc9cdb
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
@@ -23,9 +23,9 @@
  libs:: $(srcdir)/profile/prefs.js
  	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
  
+ ifndef LIBXUL_SDK
  # channel-prefs.js is handled separate from other prefs due to bug 756325
  libs:: $(srcdir)/profile/channel-prefs.js
- 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
 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
mozilla