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

Posted to commits@netbeans.apache.org by ge...@apache.org on 2017/12/02 11:10:26 UTC

[incubator-netbeans] 01/01: Merge pull request #312 from sdedic/sdedic/fix-javashell-licenses

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

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

commit eda38dd5154db27bd9b7b21b033cd885f8e0c8be
Merge: dfcc859 cc6d6c7
Author: Geertjan Wielenga <ge...@oracle.com>
AuthorDate: Sat Dec 2 12:10:22 2017 +0100

    Merge pull request #312 from sdedic/sdedic/fix-javashell-licenses
    
    Javashell fixes

 .../modules/jshell/support/ContentParserTest.java        |  9 +++++++++
 .../org/netbeans/modules/jshell/support/reploutput.txt   | 16 ++++++++++++++++
 .../modules/jshell/support/reploutput_golden.txt         | 16 ++++++++++++++++
 lib.jshell.agent/nbproject/project.properties            |  2 +-
 libs.jshell.compile/external/binaries-list               |  2 +-
 .../{nb-jshell-license.txt => jshell-9-license.txt}      |  5 +++--
 libs.jshell.compile/nbproject/project.xml                |  2 +-
 nbbuild/build.xml                                        |  1 -
 8 files changed, 47 insertions(+), 6 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.