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 88AB4C61A for ; Thu, 27 Jun 2013 13:40:30 +0000 (UTC) Received: (qmail 2975 invoked by uid 500); 27 Jun 2013 13:40:29 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 2946 invoked by uid 500); 27 Jun 2013 13:40:26 -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 2933 invoked by uid 99); 27 Jun 2013 13:40:25 -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, 27 Jun 2013 13:40:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BE40738665; Thu, 27 Jun 2013 13:40:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pplaquette@apache.org To: commits@cordova.apache.org Date: Thu, 27 Jun 2013 13:40:25 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] js commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/d422f84c Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/d422f84c Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/d422f84c Branch: refs/heads/master Commit: d422f84c59e4b2fb0e1b4c272635579a623ae674 Parents: 718d011 d81abfc Author: pplaquette Authored: Thu Jun 27 11:26:53 2013 +0200 Committer: pplaquette Committed: Thu Jun 27 11:26:53 2013 +0200 ---------------------------------------------------------------------- Gruntfile.js | 2 +- lib/common/plugin/FileWriter.js | 35 +-- lib/ios/exec.js | 2 +- lib/scripts/bootstrap-android.js | 2 + .../plugin/windowsphone/XHRPatch/plugininit.js | 255 ------------------- 5 files changed, 22 insertions(+), 274 deletions(-) ----------------------------------------------------------------------