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 A6082106D3 for ; Thu, 25 Apr 2013 21:52:59 +0000 (UTC) Received: (qmail 3963 invoked by uid 500); 25 Apr 2013 21:52:59 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 3921 invoked by uid 500); 25 Apr 2013 21:52:59 -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 3832 invoked by uid 99); 25 Apr 2013 21:52:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Apr 2013 21:52:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1331F88178A; Thu, 25 Apr 2013 21:52:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: commits@cordova.apache.org Date: Thu, 25 Apr 2013 21:53:02 -0000 Message-Id: In-Reply-To: <4f5efd4e13ab4c7fabf1b9d9121f7d17@git.apache.org> References: <4f5efd4e13ab4c7fabf1b9d9121f7d17@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] js commit: Merge branch '2.7.x' of https://git-wip-us.apache.org/repos/asf/cordova-js into 2.7.x Merge branch '2.7.x' of https://git-wip-us.apache.org/repos/asf/cordova-js into 2.7.x Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/0dceecad Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/0dceecad Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/0dceecad Branch: refs/heads/2.7.x Commit: 0dceecadfcd61661b267eaa1ded59ae02d57ec25 Parents: 130c57a 0b94579 Author: Joe Bowser Authored: Thu Apr 25 14:36:34 2013 -0700 Committer: Joe Bowser Committed: Thu Apr 25 14:36:34 2013 -0700 ---------------------------------------------------------------------- lib/ios/exec.js | 18 +++++++++++++----- lib/scripts/plugin_loader.js | 2 +- lib/windows8/platform.js | 4 ++-- 3 files changed, 16 insertions(+), 8 deletions(-) ----------------------------------------------------------------------