This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit a7566b1f2139b5af172e161f2911a63d31c23168
Merge: 8f1f57b 12f1dad
Author: Tomáš Myšík <tomas.my...@gmail.com>
AuthorDate: Wed Oct 31 05:39:04 2018 +0100
Merge pull request #996 from junichi11/netbeans-1575-twig-smarty-icon
[NETBEANS-1575] Change twig and smarty file icons
php/php.smarty/licenseinfo.xml | 5 +++++
.../modules/php/smarty/editor/TplDataObject.java | 4 +++-
.../org/netbeans/modules/php/smarty/resources/layer.xml | 4 ++--
.../netbeans/modules/php/smarty/resources/tpl-icon.png | Bin 0 -> 3287 bytes
php/php.twig/licenseinfo.xml | 5 +++++
.../netbeans/modules/php/twig/editor/TwigDataObject.java | 10 ++++++----
.../org/netbeans/modules/php/twig/resources/layer.xml | 4 ++--
.../netbeans/modules/php/twig/resources/twig-icon.png | Bin 0 -> 3301 bytes
8 files changed, 23 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
