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 4E80D17A1A for ; Wed, 22 Apr 2015 21:29:52 +0000 (UTC) Received: (qmail 71557 invoked by uid 500); 22 Apr 2015 21:29:52 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 71459 invoked by uid 500); 22 Apr 2015 21:29:52 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 71443 invoked by uid 99); 22 Apr 2015 21:29:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 21:29:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 11FF5E03D0; Wed, 22 Apr 2015 21:29:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shazron@apache.org To: commits@cordova.apache.org Date: Wed, 22 Apr 2015 21:29:53 -0000 Message-Id: <7d8a5de97f524da5b1d99708111e60f9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ios commit: Merge branch 'master' into 4.0.x Merge branch 'master' into 4.0.x Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/96ffa30d Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/96ffa30d Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/96ffa30d Branch: refs/heads/4.0.x Commit: 96ffa30de4783c0fbe0ae28616ee79f4494387ae Parents: 5162e1d f3dfb92 Author: Shazron Abdullah Authored: Wed Apr 22 14:29:39 2015 -0700 Committer: Shazron Abdullah Committed: Wed Apr 22 14:29:39 2015 -0700 ---------------------------------------------------------------------- .../scripts/cordova/build-debug.xcconfig | 3 +- .../scripts/cordova/build-extras.xcconfig | 22 ++++++ .../scripts/cordova/build-release.xcconfig | 4 +- bin/templates/scripts/cordova/lib/build.js | 79 ++++++++++++++++++-- 4 files changed, 98 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org