You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@netbeans.apache.org by ma...@apache.org on 2018/06/19 17:50:27 UTC

[incubator-netbeans] 04/04: Merge branch 'licenses_backport' into release90

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

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

commit 70c2be6e4f0c867067e318c471c915774911bc29
Merge: ac6edc6 82c3f25
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Tue Jun 19 19:49:00 2018 +0200

    Merge branch 'licenses_backport' into release90
    
    Reviewed via PR#594

 libs.smack/external/smack-3.1.0-license.txt        |  94 +++-
 nbbuild/licenses/Apache-2.0-ant                    | 272 ++++++++++++
 .../licenses/Apache-2.0-smack                      |  99 ++++-
 .../external/ant-1.10.1-license.txt                | 475 ++++++++++++---------
 o.apache.xml.resolver/build.xml                    |   7 +-
 5 files changed, 736 insertions(+), 211 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