You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2014/06/28 21:11:14 UTC
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ant
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/66329f7f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/66329f7f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/66329f7f
Branch: refs/heads/master
Commit: 66329f7fedd62a756c3fc8fce80edf2eb9b4f84e
Parents: 211b718 6e88f92
Author: Jan Mat�rne <jh...@apache.org>
Authored: Sat Jun 28 21:10:26 2014 +0200
Committer: Jan Mat�rne <jh...@apache.org>
Committed: Sat Jun 28 21:10:26 2014 +0200
----------------------------------------------------------------------
CONTRIBUTORS | 2 +
ReleaseInstructions | 6 -
WHATSNEW | 20 ++
contributors.xml | 8 +
manual/Types/filterchain.html | 29 ++-
src/etc/testcases/filters/build.xml | 33 ++++
.../filters/expected/replacetokens.double.test | 2 +
.../filters/input/replacetokens.double.test | 2 +
.../filters/input/replacetokens.mustache.test | 2 +
.../apache/tools/ant/filters/ReplaceTokens.java | 185 +++++++++----------
.../optional/junit/XMLJUnitResultFormatter.java | 8 +-
.../org/apache/tools/tar/TarInputStream.java | 14 +-
src/main/org/apache/tools/tar/TarUtils.java | 22 ++-
.../tools/ant/filters/ReplaceTokensTest.java | 26 ++-
14 files changed, 232 insertions(+), 127 deletions(-)
----------------------------------------------------------------------