You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2019/12/13 20:18:55 UTC

[netbeans] 02/02: Merge branch 'master' of https://github.com/apache/netbeans

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

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

commit b8fb34ded463feb8ba1c8eea560c1a205a4ccb85
Merge: 530f557 5a1fb3e
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Fri Dec 13 21:15:59 2019 +0100

    Merge branch 'master' of https://github.com/apache/netbeans

 nbbuild/javadoctools/build.xml             | 1 +
 nbbuild/javadoctools/export2apichanges.xsl | 2 +-
 nbbuild/javadoctools/export2branding.xsl   | 5 ++---
 nbbuild/javadoctools/export2index.xsl      | 3 +--
 nbbuild/javadoctools/export2layer.xsl      | 5 ++---
 nbbuild/javadoctools/export2property.xsl   | 2 +-
 nbbuild/javadoctools/export2usecases.xsl   | 1 +
 nbbuild/javadoctools/jsonhelp.xsl          | 2 ++
 nbbuild/javadoctools/netbeans.css          | 8 +++++++-
 nbbuild/javadoctools/prose.css             | 2 +-
 10 files changed, 19 insertions(+), 12 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