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 899 44a28160de40
parent 869 0dd25a92df97
child 904 6a889427cd4f 
--- a/firefox-branded-icons.patch	Thu Dec 31 10:00:30 2015 +0100
+++ b/firefox-branded-icons.patch	Sun Jan 24 10:29:45 2016 +0100
@@ -1,6 +1,6 @@
 # HG changeset patch
 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
-# Parent  dbca8a673de340999f67eb321169b44cc4109faf
+# Parent  e10e9bf6ab3a74655998bd0286d248f5d17a601a
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
@@ -21,12 +21,12 @@
 +endif
  endif
  
- 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
  	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
- endif
+ 
+ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
 --- a/browser/branding/branding-common.mozbuild
 +++ b/browser/branding/branding-common.mozbuild
@@ -49,7 +49,7 @@
 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
-@@ -669,18 +669,21 @@
+@@ -670,18 +670,21 @@
  @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
  @RESPATH@/chrome/toolkit@JAREXT@
@@ -70,4 +70,4 @@
  @RESPATH@/browser/chrome/webide.manifest
  @RESPATH@/browser/@PREF_DIR@/webide-prefs.js
  
- ; shell icons
+ ; DevTools
mozilla