This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch release100 in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 8e8763dd8a27918b22b4af8519cfd93d5946a83a Merge: 6242f29 c308357 Author: Matthias Bläsing <[email protected]> AuthorDate: Thu Nov 29 16:00:18 2018 +0100 Merge branch 'rhino_pac_release100' into release100 Review was done on [email protected] nbbuild/cluster.properties | 1 + nbbuild/licenses/MPL-2.0 | 373 ++++++++++++++++++++ platform/core.network/arch.xml | 12 +- platform/core.network/nbproject/project.xml | 9 + .../proxy/pac/datetime/PacUtilsDateTime.java | 13 +- .../proxy/pac/impl/ClassFilterPacHelpers.java | 42 --- .../proxy/pac/impl/NbPacScriptEvaluator.java | 283 +++++++-------- .../test/unit/data/pacFiles/wpad space.dat | 22 -- .../core/network/proxy/pac/PacEngineTest.java | 23 ++ platform/libs.rhino/build.xml | 24 ++ platform/libs.rhino/external/binaries-list | 17 + .../libs.rhino/external/rhino-1.7.10-license.txt | 380 +++++++++++++++++++++ platform/libs.rhino/manifest.mf | 4 + platform/libs.rhino/nbproject/project.properties | 21 ++ platform/libs.rhino/nbproject/project.xml | 39 +++ .../src/org/netbeans/libs/rhino/Bundle.properties | 22 ++ 16 files changed, 1043 insertions(+), 242 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
