Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 79475200B75 for ; Sun, 4 Sep 2016 16:34:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 78024160AC0; Sun, 4 Sep 2016 14:34:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BE16E160AAB for ; Sun, 4 Sep 2016 16:34:41 +0200 (CEST) Received: (qmail 13687 invoked by uid 500); 4 Sep 2016 14:34:41 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 13671 invoked by uid 99); 4 Sep 2016 14:34:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Sep 2016 14:34:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CAC61E0579; Sun, 4 Sep 2016 14:34:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bodewig@apache.org To: notifications@ant.apache.org Date: Sun, 04 Sep 2016 14:34:41 -0000 Message-Id: <6c1b66054ed94a99890de92e2ba0cfbc@git.apache.org> In-Reply-To: <9127bc48a99a4682a10d2f38adff2cda@git.apache.org> References: <9127bc48a99a4682a10d2f38adff2cda@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ant git commit: Merge branch '1.9.x' archived-at: Sun, 04 Sep 2016 14:34:42 -0000 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/ffd3d14c Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/ffd3d14c Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/ffd3d14c Branch: refs/heads/master Commit: ffd3d14c5541f914fb7d275d66d083b54bee7fdb Parents: 703aced 1d7b624 Author: Stefan Bodewig Authored: Sun Sep 4 16:34:27 2016 +0200 Committer: Stefan Bodewig Committed: Sun Sep 4 16:34:27 2016 +0200 ---------------------------------------------------------------------- .../ant/taskdefs/optional/TraXLiaison.java | 29 +++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/ffd3d14c/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java ----------------------------------------------------------------------