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 2018/09/07 18:34:43 UTC
[incubator-netbeans] 02/02: Merge branch 'netbeans-pr-799'
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 4e827afba7b6005db03a0f79bdb0e27ff38c295b
Merge: cc5a743 c5c2b73
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Fri Sep 7 20:27:21 2018 +0200
Merge branch 'netbeans-pr-799'
Review was done as part of PR #799
https://github.com/apache/incubator-netbeans/pull/799#issuecomment-419401260
Closes: #799
web.jsf12/external/binaries-list | 19 +++++++++-
...-1.2-license.txt => jsf-api-1.2_05-license.txt} | 3 +-
web.jsf12/nbproject/project.properties | 10 +-----
web.jsf12/nbproject/project.xml | 1 +
web.jsf12ri/external/binaries-list | 19 ++++++++++
.../external/jsf-impl-1.2_05-license.txt | 7 ++--
web.jsf12ri/nbproject/project.properties | 16 +--------
web.jsf12ri/nbproject/project.xml | 11 +-----
.../src/org/netbeans/modules/web/jsf12ri/jsf12.xml | 10 ++----
.../org/netbeans/modules/web/jsf12ri/jsf12ri.xml | 42 ----------------------
10 files changed, 47 insertions(+), 91 deletions(-)
---------------------------------------------------------------------
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