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 A5D7BE589 for ; Wed, 27 Feb 2013 21:09:56 +0000 (UTC) Received: (qmail 19709 invoked by uid 500); 27 Feb 2013 21:09:56 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 19682 invoked by uid 500); 27 Feb 2013 21:09:56 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 19664 invoked by uid 99); 27 Feb 2013 21:09:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Feb 2013 21:09:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 42B6C1031B; Wed, 27 Feb 2013 21:09:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtanner@apache.org To: commits@cordova.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [31/31] js commit: Merge branch 'master' into next Message-Id: <20130227210956.42B6C1031B@tyr.zones.apache.org> Date: Wed, 27 Feb 2013 21:09:56 +0000 (UTC) Updated Branches: refs/heads/next 03a4b3053 -> c5437f050 Merge branch 'master' into next Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/c5437f05 Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/c5437f05 Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/c5437f05 Branch: refs/heads/next Commit: c5437f050947a65045222c6ac9fa70cf71ba334e Parents: 03a4b30 81e89d6 Author: Gord Tanner Authored: Wed Feb 27 13:07:16 2013 -0800 Committer: Gord Tanner Committed: Wed Feb 27 13:07:16 2013 -0800 ---------------------------------------------------------------------- lib/android/exec.js | 2 +- lib/bada/plugin/bada/device.js | 3 - lib/common/channel.js | 4 ++ lib/common/plugin/FileTransfer.js | 4 +- lib/common/plugin/echo.js | 25 +++++++-- lib/cordova.js | 10 ++-- lib/ios/exec.js | 37 ++++++++++---- lib/scripts/bootstrap.js | 86 +++++++++++++++++++------------- test/android/test.exec.js | 30 ++++++------ 9 files changed, 125 insertions(+), 76 deletions(-) ----------------------------------------------------------------------