You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2018/08/14 21:15:09 UTC

[incubator-netbeans] branch master updated (aefd7ec -> 05d3fde)

This is an automated email from the ASF dual-hosted git repository.

junichi11 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.


    from aefd7ec  Merge pull request #678 from junichi11/module-review-php.smarty
     add 29846a1  [NETBEANS-1074] Module Review php.twig
     new 05d3fde  Merge pull request #679 from junichi11/module-review-php.twig

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 {languages.neon => php.twig}/licenseinfo.xml       | 11 ++---
 .../modules/php/twig/resources/Bundle.properties   | 51 ++++++----------------
 2 files changed, 18 insertions(+), 44 deletions(-)
 copy {languages.neon => php.twig}/licenseinfo.xml (78%)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists


[incubator-netbeans] 01/01: Merge pull request #679 from junichi11/module-review-php.twig

Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit 05d3fded714f1d9ab7d5de7b10c74d8bfe018653
Merge: aefd7ec 29846a1
Author: Junichi Yamamoto <ju...@apache.org>
AuthorDate: Wed Aug 15 06:15:06 2018 +0900

    Merge pull request #679 from junichi11/module-review-php.twig
    
    [NETBEANS-1074] Module Review php.twig

 php.twig/licenseinfo.xml                           | 32 ++++++++++++++
 .../modules/php/twig/resources/Bundle.properties   | 51 ++++++----------------
 2 files changed, 46 insertions(+), 37 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists