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 C812910143 for ; Wed, 2 Oct 2013 04:11:31 +0000 (UTC) Received: (qmail 73133 invoked by uid 500); 2 Oct 2013 04:11:31 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 73034 invoked by uid 500); 2 Oct 2013 04:11:30 -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 73021 invoked by uid 99); 2 Oct 2013 04:11:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Oct 2013 04:11:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A81468AD836; Wed, 2 Oct 2013 04:11:29 +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: Wed, 02 Oct 2013 04:11:32 -0000 Message-Id: <8fa5ae8e10e6485aae4e7423e4ed561f@git.apache.org> In-Reply-To: <8d14ed6d0acb43ff85b2916566f63912@git.apache.org> References: <8d14ed6d0acb43ff85b2916566f63912@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: Merge branch 'cordova-3.1.x' of https://git-wip-us.apache.org/repos/asf/cordova-cli into cordova-3.1.x Merge branch 'cordova-3.1.x' of https://git-wip-us.apache.org/repos/asf/cordova-cli into cordova-3.1.x Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/37f49b56 Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/37f49b56 Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/37f49b56 Branch: refs/heads/cordova-3.1.x Commit: 37f49b5631715b43c5d3e8ecefeff3b6e1de43d1 Parents: 7cfbe67 1905677 Author: Steven Gill Authored: Tue Oct 1 17:33:37 2013 -0700 Committer: Steven Gill Committed: Tue Oct 1 17:33:37 2013 -0700 ---------------------------------------------------------------------- package.json | 2 +- spec/config_parser.spec.js | 15 +++++++++++---- spec/fixtures/templates/no_content_config.xml | 19 +++++++++++++++++++ src/config_parser.js | 2 +- 4 files changed, 32 insertions(+), 6 deletions(-) ----------------------------------------------------------------------