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

[jlahoda]

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 db2399b6427dfc2f6f63b28c52da1b64b790ec7a
Merge: 102046d 98db1fe
Author: Jan Lahoda 
AuthorDate: Tue Mar 13 19:46:34 2018 +0100

Merge branch 'master' into jdk18_3

 .../debugger/jpda/actions/StartActionProvider.java   | 16 
 nbbuild/antsrc/org/netbeans/nbbuild/LayerIndex.java  |  6 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
jlah...@apache.org.

-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@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 branch 'master' into jdk18_3

[jlahoda]

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 967fac3060f0c9bfe64ea7b1d332c18258df71a9
Merge: 766be2c 00193de
Author: Jan Lahoda 
AuthorDate: Thu Mar 8 19:53:46 2018 +0100

Merge branch 'master' into jdk18_3

 README.md  | 7 +
 ant.browsetask/build.xml   | 2 +-
 ant.debugger/build.xml | 2 +-
 ant.freeform/build.xml | 2 +-
 ant.grammar/build.xml  | 2 +-
 ant.kit/build.xml  | 2 +-
 api.annotations.common/build.xml   | 2 +-
 api.debugger.jpda/build.xml| 2 +-
 api.debugger/build.xml | 2 +-
 api.htmlui/build.xml   | 2 +-
 api.intent/build.xml   | 2 +-
 api.io/build.xml   | 2 +-
 api.java.classpath/build.xml   | 2 +-
 api.java/build.xml | 2 +-
 api.maven/build.xml| 2 +-
 api.progress.compat8/build.xml | 2 +-
 api.progress.nb/build.xml  | 2 +-
 api.progress/build.xml | 2 +-
 api.search/build.xml   | 2 +-
 api.templates/build.xml| 2 +-
 api.visual/build.xml   | 2 +-
 api.xml.ui/build.xml   | 2 +-
 api.xml/build.xml  | 2 +-
 apisupport.ant/build.xml   | 2 +-
 .../apisupport/project/ui/ModuleActions.java   |31 +-
 .../example-external-projects/html4j/build.xml | 2 +-
 .../example-external-projects/javafx/build.xml | 2 +-
 .../suite1/action-project/build.xml| 2 +-
 .../suite1/support/lib-project/build.xml   | 2 +-
 .../suite2/misc-project/build.xml  | 2 +-
 .../suite3/dummy-project/build.xml | 2 +-
 .../suite4/module1/build.xml   | 2 +-
 .../suite4/module2/build.xml   | 2 +-
 apisupport.harness/build.xml   | 2 +-
 apisupport.harness/release/build.xml   | 2 +-
 apisupport.installer.maven/build.xml   | 2 +-
 apisupport.installer/build.xml | 2 +-
 apisupport.kit/build.xml   | 2 +-
 apisupport.project/build.xml   | 2 +-
 apisupport.refactoring/build.xml   | 2 +-
 .../test/qa-functional/data/testRename/build.xml   | 2 +-
 apisupport.wizards/build.xml   | 2 +-
 applemenu/build.xml| 2 +-
 autoupdate.cli/build.xml   | 2 +-
 autoupdate.pluginimporter/build.xml| 2 +-
 autoupdate.services/build.xml  | 2 +-
 autoupdate.ui/build.xml| 2 +-
 beans/build.xml| 2 +-
 bugtracking.bridge/build.xml   | 2 +-
 bugtracking.commons/build.xml  | 2 +-
 bugtracking/build.xml  | 2 +-
 bugzilla.exceptionreporter/build.xml   | 2 +-
 bugzilla/build.xml | 2 +-
 c.google.guava/build.xml   | 2 +-
 c.googlecode.javaewah.JavaEWAH/build.xml   | 2 +-
 c.jcraft.jsch/build.xml| 2 +-
 c.jcraft.jzlib/build.xml   | 2 +-
 classfile/build.xml| 2 +-
 code.analysis/build.xml| 2 +-
 core.browser.webview/build.xml | 2 +-
 core.browser/build.xml | 2 +-
 core.execution/build.xml   | 2 +-
 core.ide/build.xml | 2 +-
 core.io.ui/build.xml   | 2 +-
 core.kit/build.xml | 2 +-
 core.multitabs.project/build.xml   | 2 +-
 core.multitabs/build.xml   | 2 +-
 core.multiview/build.xml   | 2 +-
 core.nativeaccess/build.xml| 2 +-
 core.netigso/build.xml | 2 +-
 core.network/build.xml | 2 +-
 core.osgi/build.xml| 2 +-
 core.output2/build.xml | 2 +-