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
jlah...@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
