Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/0d58df76 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/0d58df76 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/0d58df76 Branch: refs/heads/master Commit: 0d58df76f65efd43b907a20e245b84e1129b1b05 Parents: 5db9f34 bcc245e Author: Stefan Bodewig <[email protected]> Authored: Wed Dec 21 10:52:05 2016 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Wed Dec 21 10:52:05 2016 +0100 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/Main.java | 8 ++++---- src/main/org/apache/tools/ant/launch/Launcher.java | 4 +++- .../tools/ant/taskdefs/optional/clearcase/ClearCase.java | 2 +- .../ant/taskdefs/optional/junit/AggregateTransformer.java | 4 ++-- .../tools/ant/taskdefs/optional/junit/FailureRecorder.java | 2 +- .../tools/ant/taskdefs/optional/splash/SplashTask.java | 7 ++++--- 6 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/0d58df76/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java ----------------------------------------------------------------------
