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/14bd7590 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/14bd7590 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/14bd7590 Branch: refs/heads/master Commit: 14bd7590fbc50f5b3146288584f9116e37ee38c1 Parents: 732309b c9025be Author: Jan Matèrne <j...@apache.org> Authored: Tue Jan 30 06:58:56 2018 +0100 Committer: Jan Matèrne <j...@apache.org> Committed: Tue Jan 30 06:58:56 2018 +0100 ---------------------------------------------------------------------- WHATSNEW | 4 + manual/Tasks/concat.html | 8 +- manual/Tasks/ejb.html | 92 ++++++++++---------- .../ant/taskdefs/optional/image/Image.java | 3 + .../ant/taskdefs/optional/image/ImageTest.java | 6 +- 5 files changed, 62 insertions(+), 51 deletions(-) ----------------------------------------------------------------------
