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 2017/10/15 15:55:37 UTC

[3/3] incubator-netbeans git commit: Merge branch 'pr/7'

Merge branch 'pr/7'

This closes: #7


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/c361d458
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/c361d458
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/c361d458

Branch: refs/heads/master
Commit: c361d45832bd745318045b7216c425a8f3468b2f
Parents: 9a8e28b 2046051
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 15 17:55:23 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 15 17:55:23 2017 +0200

----------------------------------------------------------------------
 api.annotations.common/apichanges.xml           | 59 ++++++--------------
 api.annotations.common/external/binaries-list   |  2 +-
 .../external/jsr305-2.0.0-license.txt           | 42 ++++++++++++++
 .../external/jsr305-2.0.0-notice.txt            |  5 ++
 .../external/jsr305-license.txt                 | 15 -----
 .../nbproject/project.properties                |  2 +-
 .../javax.annotation.processing.Processor       |  2 +-
 7 files changed, 66 insertions(+), 61 deletions(-)
----------------------------------------------------------------------