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/netbeans.git
commit 649cfd32c7c089fea37125c95b948867e825ec43
Merge: abd7b26 c58244a
Author: Matthias Bläsing <mblaes...@doppel-helix.eu>
AuthorDate: Fri Dec 13 20:49:39 2019 +0100
Merge remote-tracking branch 'github/pr/1726'
Closes: #1726
ide/o.apache.commons.codec/build.xml | 8 ++++----
ide/o.apache.commons.codec/external/binaries-list | 2 +-
...mmons-codec-1.3-license.txt => commons-codec-1.13-license.txt} | 4 ++--
ide/o.apache.commons.codec/external/commons-codec-1.13-notice.txt | 3 +++
ide/o.apache.commons.codec/external/commons-codec-1.3-notice.txt | 3 ---
ide/o.apache.commons.codec/nbproject/project.properties | 2 ++
ide/o.apache.commons.codec/nbproject/project.xml | 2 +-
.../antsrc/org/netbeans/nbbuild/extlibs/ignored-binary-overlaps | 1 -
8 files changed, 13 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
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
