This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 76448e5011d37650a804a9a1c4fdf36f676807f3 Merge: 8e19dd9 33d95c5 Author: Neil C Smith <[email protected]> AuthorDate: Thu Oct 28 10:33:42 2021 +0100 Merge pull request #3268 from apache/delivery Merge delivery to master after 12.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: [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
