[netbeans] branch master updated (61123c2 -> 6c58b10)

[ma...@apache.org]

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

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


    from 61123c2  Merge pull request #2304 from Akshay-Gupta-Oracle/nbjavac14
     new 56ffe7d  Fix Spring Framework 3 Library
     new 1387f10  Remove nbjavac library definition
     new 6c58b10  Merge pull request #2302 from matthiasblaesing/fix-libraries

The 4228 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:
 java/libs.javacapi/manifest.mf                     |  1 -
 .../org/netbeans/libs/javacapi/Bundle.properties   |  4 ---
 .../org/netbeans/libs/javacapi/javac-library.xml   | 32 ----------------------
 .../src/org/netbeans/libs/javacapi/layer.xml       | 31 ---------------------
 .../nbproject/project.properties                   |  2 --
 .../libs/springframework/spring-framework300.xml   |  2 --
 6 files changed, 72 deletions(-)
 delete mode 100644 java/libs.javacapi/src/org/netbeans/libs/javacapi/javac-library.xml
 delete mode 100644 java/libs.javacapi/src/org/netbeans/libs/javacapi/layer.xml


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