Merge branch 'pr/115'

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

Branch: refs/heads/master
Commit: 9bad3560a59688ba50d6b9c8fa4fc26431eaf681
Parents: 4a55576 79d0b48
Author: Matthias Bläsing <[email protected]>
Authored: Sun Oct 15 19:07:20 2017 +0200
Committer: Matthias Bläsing <[email protected]>
Committed: Sun Oct 15 19:07:20 2017 +0200

----------------------------------------------------------------------
 libs.jvyamlb/external/binaries-list             |  2 +-
 libs.jvyamlb/external/jvyamlb-0.2.6-license.txt | 19 +++++++++++++++++++
 libs.jvyamlb/nbproject/project.properties       |  2 +-
 libs.jvyamlb/nbproject/project.xml              |  4 ++--
 4 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


Reply via email to