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
branchfirefox14
changeset 480 f99d16f8b0f5
parent 462 2d86bdb4277f 
--- a/firefox-branded-icons.patch	Mon Jun 11 20:16:11 2012 +0200
+++ b/firefox-branded-icons.patch	Thu Jun 14 09:20:26 2012 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 9e165dc62d6ba0c3b2a82387a238fe5811acdc92
+# Parent 7f0b0738f036cd9d2e51c51c3552dc608ac598f9
 
 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