[ https://issues.apache.org/jira/browse/NETBEANS-126?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16283974#comment-16283974 ]
ASF GitHub Bot commented on NETBEANS-126: ----------------------------------------- matthiasblaesing closed pull request #289: [NETBEANS-126] Replace with trademark free icons URL: https://github.com/apache/incubator-netbeans/pull/289 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20-disabled.png b/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20-disabled.png index d6168216e..0e697f806 100644 Binary files a/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20-disabled.png and b/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20-disabled.png differ diff --git a/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20.png b/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20.png index d6168216e..176a8020a 100644 Binary files a/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20.png and b/css.editor/src/org/netbeans/modules/css/resources/icons/chrome20.png differ diff --git a/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20-disabled.png b/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20-disabled.png index d6168216e..09b0f9945 100644 Binary files a/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20-disabled.png and b/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20-disabled.png differ diff --git a/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20.png b/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20.png index d6168216e..ffab0780c 100644 Binary files a/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20.png and b/css.editor/src/org/netbeans/modules/css/resources/icons/firefox20.png differ diff --git a/css.editor/src/org/netbeans/modules/css/resources/icons/ie20-disabled.png b/css.editor/src/org/netbeans/modules/css/resources/icons/ie20-disabled.png index d6168216e..b2f00b914 100644 Binary files a/css.editor/src/org/netbeans/modules/css/resources/icons/ie20-disabled.png and b/css.editor/src/org/netbeans/modules/css/resources/icons/ie20-disabled.png differ diff --git a/css.editor/src/org/netbeans/modules/css/resources/icons/ie20.png b/css.editor/src/org/netbeans/modules/css/resources/icons/ie20.png index d6168216e..d339590ae 100644 Binary files a/css.editor/src/org/netbeans/modules/css/resources/icons/ie20.png and b/css.editor/src/org/netbeans/modules/css/resources/icons/ie20.png differ diff --git a/css.editor/src/org/netbeans/modules/css/resources/icons/opera20-disabled.png b/css.editor/src/org/netbeans/modules/css/resources/icons/opera20-disabled.png index d6168216e..bcf1ba00c 100644 Binary files a/css.editor/src/org/netbeans/modules/css/resources/icons/opera20-disabled.png and b/css.editor/src/org/netbeans/modules/css/resources/icons/opera20-disabled.png differ diff --git a/css.editor/src/org/netbeans/modules/css/resources/icons/opera20.png b/css.editor/src/org/netbeans/modules/css/resources/icons/opera20.png index d6168216e..2c80ae41d 100644 Binary files a/css.editor/src/org/netbeans/modules/css/resources/icons/opera20.png and b/css.editor/src/org/netbeans/modules/css/resources/icons/opera20.png differ diff --git a/css.editor/src/org/netbeans/modules/css/resources/icons/safari20-disabled.png b/css.editor/src/org/netbeans/modules/css/resources/icons/safari20-disabled.png index d6168216e..c972b0256 100644 Binary files a/css.editor/src/org/netbeans/modules/css/resources/icons/safari20-disabled.png and b/css.editor/src/org/netbeans/modules/css/resources/icons/safari20-disabled.png differ diff --git a/css.editor/src/org/netbeans/modules/css/resources/icons/safari20.png b/css.editor/src/org/netbeans/modules/css/resources/icons/safari20.png index d6168216e..44369a3f3 100644 Binary files a/css.editor/src/org/netbeans/modules/css/resources/icons/safari20.png and b/css.editor/src/org/netbeans/modules/css/resources/icons/safari20.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chrome_16x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chrome_16x.png index 52855d9a8..5ab16b513 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chrome_16x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chrome_16x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chrome_24x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chrome_24x.png index 297379dfe..922b645c3 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chrome_24x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chrome_24x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chromium_16x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chromium_16x.png index 52855d9a8..5ab16b513 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chromium_16x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chromium_16x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chromium_24x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chromium_24x.png index 297379dfe..922b645c3 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chromium_24x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_chromium_24x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_edge_16x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_edge_16x.png index 52855d9a8..5ab16b513 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_edge_16x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_edge_16x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_edge_24x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_edge_24x.png index 297379dfe..922b645c3 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_edge_24x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_edge_24x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_firefox_16x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_firefox_16x.png index 52855d9a8..5ab16b513 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_firefox_16x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_firefox_16x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_firefox_24x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_firefox_24x.png index 297379dfe..922b645c3 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_firefox_24x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_firefox_24x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_ie_16x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_ie_16x.png index 52855d9a8..5ab16b513 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_ie_16x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_ie_16x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_ie_24x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_ie_24x.png index 297379dfe..922b645c3 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_ie_24x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_ie_24x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_opera_16x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_opera_16x.png index 52855d9a8..5ab16b513 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_opera_16x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_opera_16x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_opera_24x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_opera_24x.png index 297379dfe..922b645c3 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_opera_24x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_opera_24x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_safari_16x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_safari_16x.png index 52855d9a8..5ab16b513 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_safari_16x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_safari_16x.png differ diff --git a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_safari_24x.png b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_safari_24x.png index 297379dfe..922b645c3 100644 Binary files a/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_safari_24x.png and b/web.browser.api/src/org/netbeans/modules/web/browser/ui/resources/browser_safari_24x.png differ ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org > Browser icons needs to be re-instated > ------------------------------------- > > Key: NETBEANS-126 > URL: https://issues.apache.org/jira/browse/NETBEANS-126 > Project: NetBeans > Issue Type: Bug > Reporter: lbruun > Assignee: lbruun > Priority: Minor > Labels: donation-fixes, pull-request-available > Attachments: css-editor-icons-usage.png, css-editor-icons.png, > nb-icon.png, web-browser-api-icons.png > > > A number of browser icons were "removed" from the donation, in [this > changeset|http://hg.netbeans.org/releases/rev/034a0c65c347?revcount=1500]. > They weren't actually removed, rather they were all replaced with a dummy > NetBeans icon. I think Oracle removed them because Oracle couldn't donate > such icons, as they don't "own" these trademarks. > h2. Module path "css.editor" > Removed from {{css.editor}}: > !css-editor-icons.png! > The browser icons in this module are - as far as I can tell - only used for > code completion hints on CSS where they are used to signal if the browser has > support for the CSS property or not. Example: > !css-editor-icons-usage.png! > h2. Module path "web.browser.api" > Removed from {{web.browser.api}}: > !web-browser-api-icons.png! > The above icons are all replaced in the donation with a dummy NetBeans icon: > !nb-icon.png! > I'll do a PR to re-instate these. -- This message was sent by Atlassian JIRA (v6.4.14#64029)