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/07 19:27:43 UTC

[incubator-netbeans] 01/01: Merge pull request #582 from matthiasblaesing/netbeans-830_netbeans-831

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 9d39c80921c1dd03fdc59ab5492832b4407d3a68
Merge: f9bbf29 152c3f4
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Thu Jun 7 21:27:34 2018 +0200

    Merge pull request #582 from matthiasblaesing/netbeans-830_netbeans-831
    
    [NETBEANS-830][NETBEANS-831] Fix license info for jaxb implementation

 ...2-license.txt => jaxb-2.2.5-2-jaxb-license.txt} |  2 +-
 ...-license.txt => jaxb-2.2.5-2-jaxb1-license.txt} | 94 ++++++++++++++++++++-
 ...-2-license.txt => jaxb-2.2.5-2-xjc-license.txt} | 31 ++++++-
 .../licenses/CDDL-1.1-BSD-MIT-jaxb1-xjc            | 98 ++++++++++++++++++++--
 .../licenses/CDDL-1.1-MIT-jaxb-xjc                 | 33 ++++++--
 5 files changed, 238 insertions(+), 20 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
matthiasblaesing@apache.org.

---------------------------------------------------------------------
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