You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/02/15 22:45:50 UTC

[netbeans] 01/01: Merge pull request #1951 from apache/master

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

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

commit 9d007f64d7e5facd6f65639e8487d25385aa7ca5
Merge: 017ddb7 ff07b1c
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Feb 15 23:45:40 2020 +0100

    Merge pull request #1951 from apache/master
    
    sync master to release 113 branch for vc1

 .travis.yml                                                  |  5 +++++
 .../modules/maven/newproject/ChooseArchetypePanel.form       |  2 +-
 .../modules/maven/newproject/ChooseArchetypePanel.java       |  4 ++--
 platform/api.annotations.common/apichanges.xml               |  2 +-
 platform/api.annotations.common/arch.xml                     | 12 ++++++------
 .../netbeans/api/annotations/common/SuppressWarnings.java    |  4 ++--
 .../org/netbeans/api/annotations/common/package-info.java    |  5 ++---
 7 files changed, 19 insertions(+), 15 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