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 CEBC31116C for ; Fri, 13 Jun 2014 10:45:07 +0000 (UTC) Received: (qmail 80387 invoked by uid 500); 13 Jun 2014 10:45:07 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 80303 invoked by uid 500); 13 Jun 2014 10:45:07 -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 80271 invoked by uid 99); 13 Jun 2014 10:45:07 -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, 13 Jun 2014 10:45:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7D09D932DA9; Fri, 13 Jun 2014 10:45:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zalun@apache.org To: commits@cordova.apache.org Date: Fri, 13 Jun 2014 10:45:08 -0000 Message-Id: <2b87e4703a324e868c0b43554aa0f69a@git.apache.org> In-Reply-To: <0d4a9a19464d4a7896d444c561f3956e@git.apache.org> References: <0d4a9a19464d4a7896d444c561f3956e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge remote-tracking branch 'rodms/CB-6895' Merge remote-tracking branch 'rodms/CB-6895' Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/aa070bbe Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/aa070bbe Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/aa070bbe Branch: refs/heads/master Commit: aa070bbec860d54add6683fe84784356761dfc5b Parents: 4548595 c3997c2 Author: Piotr Zalewa Authored: Fri Jun 13 12:44:47 2014 +0200 Committer: Piotr Zalewa Committed: Fri Jun 13 12:44:47 2014 +0200 ---------------------------------------------------------------------- .../src/cordova/metadata/firefoxos_parser.js | 101 +++++++++++-------- 1 file changed, 59 insertions(+), 42 deletions(-) ----------------------------------------------------------------------