[2/2] incubator-netbeans git commit: Merge branch 'pr/113'

[ma...@apache.org]

Merge branch 'pr/113'

The content of the two binaries is identical, the files from maven central and the original netbeans file were zipped with different timestamps and differing directory order.

Diffoscope output is here: https://try.diffoscope.org/qayzdzqugqge.html

To check yourself: unzip both files and run a recursive diff over it.

This closes #113


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

Branch: refs/heads/master
Commit: ff1bc6c47951f9f42231c0c06ff58fbfc99f810e
Parents: b136e12 a204dcc
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Wed Oct 11 20:37:00 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Wed Oct 11 20:37:00 2017 +0200

----------------------------------------------------------------------
 libs.xerces/external/binaries-list           |  2 +-
 libs.xerces/external/xerces-2.8.0-notice.txt | 15 +++++++++++++++
 libs.xerces/nbproject/project.properties     |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------