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 BA66611C87 for ; Fri, 16 May 2014 19:25:23 +0000 (UTC) Received: (qmail 27543 invoked by uid 500); 16 May 2014 10:17:00 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 17759 invoked by uid 500); 16 May 2014 10:16:21 -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 14183 invoked by uid 99); 16 May 2014 10:16:10 -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, 16 May 2014 10:16:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8A22791E97F; Thu, 15 May 2014 18:34:50 +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, 15 May 2014 18:34:52 -0000 Message-Id: <5305f046029b409a9d5cca7260d7ebb6@git.apache.org> In-Reply-To: <84d3320752444bfda9df55985f4b22b1@git.apache.org> References: <84d3320752444bfda9df55985f4b22b1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: Merge branch 'fix-build' of https://github.com/mozilla-cordova/cordova-firefoxos Merge branch 'fix-build' of https://github.com/mozilla-cordova/cordova-firefoxos Project: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/commit/1c279a3f Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/1c279a3f Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/1c279a3f Branch: refs/heads/master Commit: 1c279a3fcfe4d158b01b427f1f166f986ad8f01f Parents: 5709735 554df35 Author: Steven Gill Authored: Thu May 15 11:33:16 2014 -0700 Committer: Steven Gill Committed: Thu May 15 11:33:16 2014 -0700 ---------------------------------------------------------------------- bin/templates/project/cordova/build | 25 +---- bin/templates/project/cordova/lib/build.js | 129 +++--------------------- 2 files changed, 19 insertions(+), 135 deletions(-) ----------------------------------------------------------------------