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 6001A100B1 for ; Fri, 28 Jun 2013 14:15:38 +0000 (UTC) Received: (qmail 87390 invoked by uid 500); 28 Jun 2013 14:15:37 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 87283 invoked by uid 500); 28 Jun 2013 14:15:36 -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 86577 invoked by uid 99); 28 Jun 2013 14:15:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jun 2013 14:15:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0E2E43A63D; Fri, 28 Jun 2013 14:15:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Date: Fri, 28 Jun 2013 14:15:50 -0000 Message-Id: <1e246364574142d69880143b599d10c8@git.apache.org> In-Reply-To: <94e7ef137d99467e9e3ebce334eb1b68@git.apache.org> References: <94e7ef137d99467e9e3ebce334eb1b68@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [26/26] js commit: Merge branch 'master' into 2.9.x Merge branch 'master' into 2.9.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/e63317e5 Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/e63317e5 Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/e63317e5 Branch: refs/heads/2.9.x Commit: e63317e5480fddd9dd8dde0db431e5928d626ee1 Parents: c56748c 5ea1a88 Author: Andrew Grieve Authored: Fri Jun 28 10:14:54 2013 -0400 Committer: Andrew Grieve Committed: Fri Jun 28 10:14:54 2013 -0400 ---------------------------------------------------------------------- lib/blackberry10/exec.js | 1 - lib/blackberry10/plugin/blackberry10/capture.js | 76 ------ lib/common/plugin/FileWriter.js | 35 +-- lib/scripts/bootstrap-android.js | 2 + lib/tizen/plugin/tizen/Globalization.js | 118 ++++++++- lib/tizen/plugin/tizen/SplashScreen.js | 43 ++++ lib/windows8/plugin/windows8/DeviceProxy.js | 12 +- .../windowsphone/DOMStorage/plugininit.js | 200 --------------- .../plugin/windowsphone/XHRPatch/plugininit.js | 255 ------------------- test/blackberry10/test.capture.js | 222 ---------------- 10 files changed, 175 insertions(+), 789 deletions(-) ----------------------------------------------------------------------