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 14171108C6 for ; Thu, 27 Mar 2014 21:49:42 +0000 (UTC) Received: (qmail 4660 invoked by uid 500); 27 Mar 2014 21:49:41 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 4552 invoked by uid 500); 27 Mar 2014 21:49:40 -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 4440 invoked by uid 99); 27 Mar 2014 21:49:37 -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 Mar 2014 21:49:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1712E8AB404; Thu, 27 Mar 2014 21:49:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: steven@apache.org To: commits@cordova.apache.org Date: Thu, 27 Mar 2014 21:49:38 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cb_6337' of github.com:blackberry/cordova-cli Merge branch 'cb_6337' of github.com:blackberry/cordova-cli Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/22b14f4e Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/22b14f4e Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/22b14f4e Branch: refs/heads/master Commit: 22b14f4e7aa34b2992552a5849fd36decea0cc12 Parents: 4da7f4e da34130 Author: Steven Gill Authored: Thu Mar 27 14:33:17 2014 -0700 Committer: Steven Gill Committed: Thu Mar 27 14:33:17 2014 -0700 ---------------------------------------------------------------------- e2e/hooker.spec.js | 2 +- spec/create.spec.js | 6 +++++- spec/metadata/android_parser.spec.js | 2 +- spec/metadata/blackberry_parser.spec.js | 2 +- spec/metadata/ios_parser.spec.js | 2 +- spec/metadata/windows8_parser.spec.js | 2 +- spec/metadata/wp7_parser.spec.js | 3 ++- spec/metadata/wp8_parser.spec.js | 3 ++- src/metadata/amazon_fireos_parser.js | 3 ++- src/metadata/android_parser.js | 3 ++- src/metadata/blackberry10_parser.js | 3 ++- src/metadata/ios_parser.js | 3 ++- src/metadata/ubuntu_parser.js | 5 +++-- src/metadata/windows8_parser.js | 3 ++- src/metadata/wp7_parser.js | 3 ++- src/metadata/wp8_parser.js | 3 ++- 16 files changed, 31 insertions(+), 17 deletions(-) ----------------------------------------------------------------------