forked from Floorp-Projects/Floorp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 504645 - Remove document.png from the source tree since it is no …
…longer needed; r=dolske+mfinkle
- Loading branch information
Showing
11 changed files
with
6 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ | |
| # Jonathan Wilson <[email protected]> | ||
| # Dan Mosedale <[email protected]> | ||
| # Benjamin Smedberg <[email protected]> | ||
| # Jared Wein <[email protected]> | ||
| # | ||
| # Alternatively, the contents of this file may be used under the terms of | ||
| # either the GNU General Public License Version 2 or later (the "GPL"), or | ||
|
|
@@ -199,7 +200,6 @@ 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 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ | |
| # | ||
| # Contributor(s): | ||
| # Justin Dolske <[email protected]> (original author) | ||
| # Jared Wein <[email protected]> | ||
| # | ||
| # Alternatively, the contents of this file may be used under the terms of | ||
| # either the GNU General Public License Version 2 or later (the "GPL"), or | ||
|
|
@@ -75,7 +76,6 @@ LINUX_BRANDING_FILES = \ | |
| default16.png \ | ||
| default32.png \ | ||
| default48.png \ | ||
| document.png \ | ||
| mozicon128.png \ | ||
| $(NULL) | ||
|
|
||
|
|
||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ | |
| # | ||
| # Contributor(s): | ||
| # Justin Dolske <[email protected]> (original author) | ||
| # Jared Wein <[email protected]> | ||
| # | ||
| # Alternatively, the contents of this file may be used under the terms of | ||
| # either the GNU General Public License Version 2 or later (the "GPL"), or | ||
|
|
@@ -75,7 +76,6 @@ LINUX_BRANDING_FILES = \ | |
| default16.png \ | ||
| default32.png \ | ||
| default48.png \ | ||
| document.png \ | ||
| mozicon128.png \ | ||
| $(NULL) | ||
|
|
||
|
|
||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ | |
| # | ||
| # Contributor(s): | ||
| # Justin Dolske <[email protected]> (original author) | ||
| # Jared Wein <[email protected]> | ||
| # | ||
| # Alternatively, the contents of this file may be used under the terms of | ||
| # either the GNU General Public License Version 2 or later (the "GPL"), or | ||
|
|
@@ -75,7 +76,6 @@ LINUX_BRANDING_FILES = \ | |
| default16.png \ | ||
| default32.png \ | ||
| default48.png \ | ||
| document.png \ | ||
| mozicon128.png \ | ||
| $(NULL) | ||
|
|
||
|
|
||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ | |
| # | ||
| # Contributor(s): | ||
| # Justin Dolske <[email protected]> (original author) | ||
| # Jared Wein <[email protected]> | ||
| # | ||
| # Alternatively, the contents of this file may be used under the terms of | ||
| # either the GNU General Public License Version 2 or later (the "GPL"), or | ||
|
|
@@ -75,7 +76,6 @@ LINUX_BRANDING_FILES = \ | |
| default16.png \ | ||
| default32.png \ | ||
| default48.png \ | ||
| document.png \ | ||
| mozicon128.png \ | ||
| $(NULL) | ||
|
|
||
|
|
||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,7 @@ | |
| # Dan Mosedale <[email protected]> | ||
| # Darin Fisher <[email protected]> | ||
| # Benjamin Smedberg <[email protected]> | ||
| # Jared Wein <[email protected]> | ||
| # | ||
| # Alternatively, the contents of this file may be used under the terms of | ||
| # either the GNU General Public License Version 2 or later (the "GPL"), or | ||
|
|
@@ -178,19 +179,6 @@ GARBAGE += xulrunner | |
| endif | ||
| endif | ||
|
|
||
| ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) | ||
|
|
||
| ICON_FILES = \ | ||
| $(DIST)/branding/document.png \ | ||
| $(NULL) | ||
|
|
||
| libs:: $(ICON_FILES) | ||
| $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons | ||
|
|
||
| install:: | ||
| $(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons | ||
| endif | ||
|
|
||
| ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) | ||
| libs:: | ||
| $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default | ||
|
|
@@ -209,9 +197,6 @@ ifeq ($(OS_ARCH),WINNT) | |
| cp $(srcdir)/xulrunner.ico $(DIST)/branding/app.ico | ||
| cp $(srcdir)/document.ico $(DIST)/branding/document.ico | ||
| endif | ||
| ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) | ||
| cp $(srcdir)/document.png $(DIST)/branding/document.png | ||
| endif | ||
| ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) | ||
| cp $(srcdir)/default16.png $(DIST)/branding/default16.png | ||
| cp $(srcdir)/default32.png $(DIST)/branding/default32.png | ||
|
|
||
Binary file not shown.