This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit d4c6d52a209f91990125c6727b855fb69ad4d2ef Merge: fce017c d1f8de2 Author: Matthias Bläsing <mblaes...@doppel-helix.eu> AuthorDate: Fri Dec 8 19:18:52 2017 +0100 Merge pull request #251 from lbruun/reinstate-browser-icons [NETBEANS-126] Re-instate browser icons This merge was discussed in this thread: https://lists.apache.org/thread.html/12bda9c05fcca802ea9f6aacd32e3c844c450079ca6252d7fa87984a@%3Cdev.netbeans.apache.org%3E There was no disagreement for merging this. .../modules/css/resources/icons/chrome20-disabled.png | Bin 3842 -> 5058 bytes .../netbeans/modules/css/resources/icons/chrome20.png | Bin 3842 -> 5143 bytes .../css/resources/icons/firefox20-disabled.png | Bin 3842 -> 1256 bytes .../modules/css/resources/icons/firefox20.png | Bin 3842 -> 1380 bytes .../modules/css/resources/icons/ie20-disabled.png | Bin 3842 -> 1270 bytes .../org/netbeans/modules/css/resources/icons/ie20.png | Bin 3842 -> 1372 bytes .../modules/css/resources/icons/opera20-disabled.png | Bin 3842 -> 1087 bytes .../netbeans/modules/css/resources/icons/opera20.png | Bin 3842 -> 1133 bytes .../modules/css/resources/icons/safari20-disabled.png | Bin 3842 -> 1172 bytes .../netbeans/modules/css/resources/icons/safari20.png | Bin 3842 -> 1251 bytes .../web/browser/ui/resources/browser_chrome_16x.png | Bin 847 -> 906 bytes .../web/browser/ui/resources/browser_chrome_24x.png | Bin 4119 -> 1493 bytes .../web/browser/ui/resources/browser_chromium_16x.png | Bin 847 -> 919 bytes .../web/browser/ui/resources/browser_chromium_24x.png | Bin 4119 -> 1537 bytes .../web/browser/ui/resources/browser_edge_16x.png | Bin 847 -> 1830 bytes .../web/browser/ui/resources/browser_edge_24x.png | Bin 4119 -> 1099 bytes .../web/browser/ui/resources/browser_firefox_16x.png | Bin 847 -> 985 bytes .../web/browser/ui/resources/browser_firefox_24x.png | Bin 4119 -> 1889 bytes .../web/browser/ui/resources/browser_ie_16x.png | Bin 847 -> 982 bytes .../web/browser/ui/resources/browser_ie_24x.png | Bin 4119 -> 1824 bytes .../web/browser/ui/resources/browser_opera_16x.png | Bin 847 -> 794 bytes .../web/browser/ui/resources/browser_opera_24x.png | Bin 4119 -> 1381 bytes .../web/browser/ui/resources/browser_safari_16x.png | Bin 847 -> 866 bytes .../web/browser/ui/resources/browser_safari_24x.png | Bin 4119 -> 1770 bytes 24 files changed, 0 insertions(+), 0 deletions(-) -- To stop receiving notification emails like this one, please contact "comm...@netbeans.apache.org" <comm...@netbeans.apache.org>.