You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2018/01/22 16:53:31 UTC

[incubator-netbeans] branch master updated (144cd27 -> 33a4b82)

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

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


    from 144cd27  Merge branch 'pr/365'
     add 805cbbf  Removing accidentally omitted ancient license to avoid confusion
     new 33a4b82  Merge pull request #381 from JaroslavTulach/RemoveAncientSPL

The 1 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:
 .../diff/builtin/provider/DiffTestFile1a.txt       | 38 +++++++++++-----------
 .../diff/builtin/provider/DiffTestFile1b.txt       | 38 +++++++++++-----------
 .../diff/builtin/provider/DiffTestFile1d.txt       |  4 ---
 3 files changed, 38 insertions(+), 42 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
jtulach@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


[incubator-netbeans] 01/01: Merge pull request #381 from JaroslavTulach/RemoveAncientSPL

Posted by jt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 33a4b821f1d565ebc47bd35d0b3d225ad00bbe90
Merge: 144cd27 805cbbf
Author: Jaroslav Tulach <ja...@oracle.com>
AuthorDate: Mon Jan 22 17:53:27 2018 +0100

    Merge pull request #381 from JaroslavTulach/RemoveAncientSPL
    
    Removing ancient header from test data.

 .../diff/builtin/provider/DiffTestFile1a.txt       | 38 +++++++++++-----------
 .../diff/builtin/provider/DiffTestFile1b.txt       | 38 +++++++++++-----------
 .../diff/builtin/provider/DiffTestFile1d.txt       |  4 ---
 3 files changed, 38 insertions(+), 42 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
jtulach@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