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

Posted to commits@netbeans.apache.org by jl...@apache.org on 2018/02/12 20:08:33 UTC

[incubator-netbeans] 01/02: Merge branch 'master' into jdk18_3

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

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

commit c50cedef22d3a4c7bb63dde559bbf3d26ff68aa3
Merge: 9b27a157 1132e7b
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Mon Feb 12 20:57:20 2018 +0100

    Merge branch 'master' into jdk18_3

 .../applemenu/NbApplicationAdapterJDK8.java        |   2 +
 .../applemenu/NbApplicationAdapterJDK9.java        |   2 +
 .../JavaCompletionTask15FeaturesTest.java          | 108 ++--
 .../JavaCompletionTask17FeaturesTest.java          |  42 +-
 .../JavaCompletionTask18FeaturesTest.java          | 150 ++---
 .../JavaCompletionTask19FeaturesTest.java          |  24 +-
 .../completion/JavaCompletionTaskAdvancedTest.java | 450 +++++++--------
 .../completion/JavaCompletionTaskBasicTest.java    | 626 ++++++++++-----------
 .../JavaCompletionTaskElementCreatingTest.java     |  46 +-
 lib.profiler/build.xml                             |  12 +-
 .../profiler/heapwalk/ui/icons/impl/oqlConsole.png | Bin 0 -> 447 bytes
 11 files changed, 736 insertions(+), 726 deletions(-)

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