This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch jdk-javac in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 603d64ca26e9c0852831bebeec0f7e55857a7797 Merge: 460608e 32fc0ea Author: Jan Lahoda <[email protected]> AuthorDate: Tue Dec 19 20:49:41 2017 +0100 Merge branch 'master' into jdk-javac .../org/netbeans/api/editor/caret/EditorCaret.java | 16 +++- libs.bytelist/external/binaries-list | 1 + libs.bytelist/external/jcodings-1.0.18-license.txt | 24 ++++++ libs.bytelist/nbproject/project.properties | 1 + libs.bytelist/nbproject/project.xml | 8 +- libs.osgi/nbproject/project.properties | 2 +- libs.osgi/nbproject/project.xml | 4 +- .../nbbuild/extlibs/CreateLicenseSummary.java | 88 +++++++++++++++------- nbbuild/licenses/MIT-nocopyright | 17 +++++ nbbuild/notice-stub.txt | 10 ++- .../external/commons-codec-1.3-notice.txt | 3 + .../external/commons-httpclient-3.1-notice.txt | 5 ++ .../external/commons-io-1.4-notice.txt | 6 ++ .../external/commons-lang-2.6-notice.txt | 6 ++ .../external/commons-logging-1.1.1-notice.txt | 15 ++++ 15 files changed, 169 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
