You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ne...@apache.org on 2021/10/26 16:43:50 UTC

[netbeans] 01/01: Merge pull request #3267 from apache/delivery

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

neilcsmith pushed a commit to branch release126
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 8388dd194ac7ea7dfdaf1235742ecf987a5c268d
Merge: d5a9964 33d95c5
Author: Neil C Smith <ne...@apache.org>
AuthorDate: Tue Oct 26 17:43:41 2021 +0100

    Merge pull request #3267 from apache/delivery
    
    Merge delivery to release126 for NB12.6-rc1

 .../java/completion/JavaCompletionTask.java        |  4 ++--
 .../JavaCompletionTask114FeaturesTest.java         | 18 +++++++++++++---
 .../java/hints/jdk/ConvertTextBlockToString.java   | 11 +++++-----
 .../hints/jdk/ConvertTextBlockToStringTest.java    | 24 +++++++++++-----------
 java/java.lsp.server/vscode/src/extension.ts       | 21 +++++++++++++++++++
 .../nb-javaee/nbproject/project.properties         |  2 +-
 .../products/nb-php/nbproject/project.properties   |  2 +-
 nbi/infra/build/.common/common.properties          |  2 +-
 8 files changed, 59 insertions(+), 25 deletions(-)

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