You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jl...@apache.org on 2018/01/30 20:32:50 UTC
[incubator-netbeans] branch master updated (944f58a -> 1c6873e)
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from 944f58a Merge pull request #396 from matthiasblaesing/file-licenses
add 4364341 Removing SFS-Editors-Folder.zip and making it an external library (an alternative would be to disable/delete the appropriate test.
add 9e23793 Merging master changes to the NETBEANS-311 branch
new 1c6873e Merge pull request #388 from jlahoda/NETBEANS-311
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
editor.settings.storage/build.xml | 5 +
.../external/SFS-Editors-Folder-8.2-license.txt | 878 +++++++++++++++++++++
.../external/binaries-list | 2 +-
.../p1/Pre90403Phase1CompatibilityTest.java | 4 +-
.../compatibility/p1/SFS-Editors-Folder.zip | Bin 218601 -> 0 bytes
nbbuild/licenses/CDDL-SPL | 872 ++++++++++++++++++++
nbbuild/licenses/names.properties | 3 +-
7 files changed, 1760 insertions(+), 4 deletions(-)
create mode 100644 editor.settings.storage/external/SFS-Editors-Folder-8.2-license.txt
copy {o.n.bootstrap => editor.settings.storage}/external/binaries-list (92%)
delete mode 100644 editor.settings.storage/test/unit/src/org/netbeans/modules/editor/settings/storage/compatibility/p1/SFS-Editors-Folder.zip
create mode 100644 nbbuild/licenses/CDDL-SPL
--
To stop receiving notification emails like this one, please contact
jlahoda@apache.org.
---------------------------------------------------------------------
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
[incubator-netbeans] 01/01: Merge pull request #388 from
jlahoda/NETBEANS-311
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 1c6873efb1f4dfb47a810d285c5d1a3cb8a5f00f
Merge: 944f58a 9e23793
Author: Jan Lahoda <la...@gmail.com>
AuthorDate: Tue Jan 30 21:32:47 2018 +0100
Merge pull request #388 from jlahoda/NETBEANS-311
Removing SFS-Editors-Folder.zip and making it an external library (an…
editor.settings.storage/build.xml | 5 +
.../external/SFS-Editors-Folder-8.2-license.txt | 878 +++++++++++++++++++++
editor.settings.storage/external/binaries-list | 17 +
.../p1/Pre90403Phase1CompatibilityTest.java | 4 +-
.../compatibility/p1/SFS-Editors-Folder.zip | Bin 218601 -> 0 bytes
nbbuild/licenses/CDDL-SPL | 872 ++++++++++++++++++++
nbbuild/licenses/names.properties | 3 +-
7 files changed, 1776 insertions(+), 3 deletions(-)
--
To stop receiving notification emails like this one, please contact
jlahoda@apache.org.
---------------------------------------------------------------------
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