Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E1E4C11462 for ; Mon, 7 Jul 2014 17:50:46 +0000 (UTC) Received: (qmail 27578 invoked by uid 500); 7 Jul 2014 17:50:46 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 27519 invoked by uid 500); 7 Jul 2014 17:50:46 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 27215 invoked by uid 99); 7 Jul 2014 17:50:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jul 2014 17:50:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4D5A89A7FB8; Mon, 7 Jul 2014 17:50:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ldeluca@apache.org To: commits@cordova.apache.org Date: Mon, 07 Jul 2014 17:50:58 -0000 Message-Id: <06aaf236539645ea844ade3ab96e6335@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/14] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/4ea02c97 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/4ea02c97 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/4ea02c97 Branch: refs/heads/master Commit: 4ea02c972a16ea62f4c3b26dd59c0adf0876100a Parents: 64956fa 318c941 Author: ldeluca Authored: Mon Jun 23 12:24:42 2014 -0400 Committer: ldeluca Committed: Mon Jun 23 12:24:42 2014 -0400 ---------------------------------------------------------------------- doc/index.md | 8 +++---- www/windows8/FileTransferProxy.js | 41 ++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 13 deletions(-) ----------------------------------------------------------------------