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 2020/09/24 07:26:00 UTC

[netbeans] 02/02: Merging #2386 to master

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/netbeans.git

commit 44eff608592ae78fb34b4b534720d20985bc3ed5
Merge: 6e6c9cd f9aa503
Author: Jaroslav Tulach <ja...@oracle.com>
AuthorDate: Thu Sep 24 09:25:11 2020 +0200

    Merging #2386 to master

 .../modules/gradle/api/execute/RunUtils.java       |  3 ++
 ide/code.analysis/manifest.mf                      |  2 +-
 .../modules/analysis/api/CodeAnalysis.java         |  1 -
 ide/parsing.indexing/manifest.mf                   |  1 +
 ide/parsing.indexing/nbproject/project.properties  |  2 +-
 ide/parsing.nb/manifest.mf                         |  1 +
 ide/parsing.nb/nbproject/project.properties        |  2 +-
 ide/projectapi.nb/manifest.mf                      |  4 +--
 ide/projectapi.nb/nbproject/project.xml            |  2 +-
 ide/projectapi/manifest.mf                         |  4 +--
 ide/projectui/apichanges.xml                       | 14 ++++++++
 ide/projectui/arch.xml                             | 14 ++++++--
 ide/projectui/nbproject/project.properties         |  2 +-
 .../modules/project/ui/OpenProjectList.java        | 17 ++++++---
 .../debugger/ui/DebuggerManagerListener.java       |  9 +++--
 ide/web.browser.api/manifest.mf                    |  2 +-
 .../spi/actions/AbstractMavenActionsProvider.java  |  4 +++
 .../netbeans/nbbuild/AutoUpdateCatalogParser.java  |  7 +++-
 .../o.n.bootstrap/src/org/netbeans/CLIHandler.java |  6 +++-
 .../org/openide/windows/DummyWindowManager.java    |  5 +++
 platform/settings/nbproject/project.properties     |  2 +-
 .../modules/settings/RecognizeInstanceObjects.java | 42 +++++++++++++++++-----
 22 files changed, 112 insertions(+), 34 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