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/08 16:08:46 UTC

[3/3] incubator-netbeans git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-netbeans

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-netbeans


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

Branch: refs/heads/master
Commit: 4548dd89fb9cbbcd5c59742f207c76f294a0270f
Parents: 36c2e4b 4841308
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 8 18:07:41 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 18:07:41 2017 +0200

----------------------------------------------------------------------
 .../external/antlr-runtime-4.5.3-license.txt    | 37 --------------------
 .../external/antlr4-runtime-4.5.3-license.txt   | 37 ++++++++++++++++++++
 .../nbproject/project.properties                |  4 +--
 libs.antlr4.runtime/nbproject/project.xml       |  4 +--
 nbbuild/build.xml                               |  3 ++
 5 files changed, 44 insertions(+), 41 deletions(-)
----------------------------------------------------------------------