You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2018/08/25 08:35:36 UTC

[incubator-netbeans] branch master updated (1be3fc9 -> a86c147)

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

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


    from 1be3fc9  Merge pull request #787 from matthiasblaesing/gpl-compile-time
     add 06a02e6  [NETBEANS-1074] Module Review languages.apacheconf
     new a86c147  Merge pull request #777 from junichi11/module-review-languages.apacheconf

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:
 .../licenseinfo.xml                                |  6 ++--
 .../languages/apacheconf/resources/license.txt     | 40 ----------------------
 2 files changed, 3 insertions(+), 43 deletions(-)
 copy {languages.ini => languages.apacheconf}/licenseinfo.xml (80%)
 delete mode 100644 languages.apacheconf/src/org/netbeans/modules/languages/apacheconf/resources/license.txt


---------------------------------------------------------------------
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 #777 from junichi11/module-review-languages.apacheconf

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

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

commit a86c147bca8c094d43b224bf2bbec7ef56a1358f
Merge: 1be3fc9 06a02e6
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Sat Aug 25 10:35:34 2018 +0200

    Merge pull request #777 from junichi11/module-review-languages.apacheconf
    
    [NETBEANS-1074] Module Review languages.apacheconf

 languages.apacheconf/licenseinfo.xml               | 39 +++++++++++++++++++++
 .../languages/apacheconf/resources/license.txt     | 40 ----------------------
 2 files changed, 39 insertions(+), 40 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