Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2d86edf6 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2d86edf6 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2d86edf6 Branch: refs/heads/master Commit: 2d86edf69ebeb6d6a3b1e919fcf2dbca71baf117 Parents: d840ddb 1be6cf5 Author: Jan Matèrne <j...@apache.org> Authored: Fri May 27 16:06:16 2016 +0200 Committer: Jan Matèrne <j...@apache.org> Committed: Fri May 27 16:06:16 2016 +0200 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/AntClassLoader.java | 5 +---- src/main/org/apache/tools/ant/launch/Locator.java | 14 +++++--------- src/main/org/apache/tools/ant/taskdefs/Concat.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Jar.java | 3 +-- .../apache/tools/ant/taskdefs/ManifestClassPath.java | 7 ++----- src/main/org/apache/tools/ant/taskdefs/Zip.java | 3 +-- .../tools/ant/taskdefs/optional/unix/Symlink.java | 4 +--- src/main/org/apache/tools/ant/util/UUEncoder.java | 2 +- 8 files changed, 13 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
