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

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


    from 7112848  Merge pull request #1517 from pepness/java13javadoc
     add eac36a6  Use json from nbbuild not from ide (#1522)

No new revisions were added by this update.

Summary of changes:
 nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps         | 3 +++
 nbbuild/build.xml                                                    | 5 ++---
 nbbuild/external/binaries-list                                       | 1 +
 .../external/json-simple-1.1.1-license.txt                           | 0
 4 files changed, 6 insertions(+), 3 deletions(-)
 copy {ide/libs.json_simple => nbbuild}/external/json-simple-1.1.1-license.txt 
(100%)


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

Reply via email to