Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 121DACB97 for ; Thu, 28 Jun 2012 15:06:35 +0000 (UTC) Received: (qmail 17388 invoked by uid 500); 28 Jun 2012 15:06:34 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 17335 invoked by uid 500); 28 Jun 2012 15:06:33 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 16631 invoked by uid 99); 28 Jun 2012 15:06:33 -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, 28 Jun 2012 15:06:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0E915845E; Thu, 28 Jun 2012 15:06:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] android commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android Message-Id: <20120628150633.0E915845E@tyr.zones.apache.org> Date: Thu, 28 Jun 2012 15:06:33 +0000 (UTC) Updated Branches: refs/heads/master 98138a0a6 -> a2816e31c Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/a2816e31 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/a2816e31 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/a2816e31 Branch: refs/heads/master Commit: a2816e31c3303ebda7ed7bf2f192c3f19f3f2978 Parents: f78af9f 98138a0 Author: Joe Bowser Authored: Thu Jun 28 08:00:59 2012 -0700 Committer: Joe Bowser Committed: Thu Jun 28 08:00:59 2012 -0700 ---------------------------------------------------------------------- bin/create.js | 43 ++++++++++++++++++++------------- bin/templates/cordova/cordova.js | 4 +- bin/templates/cordova/log.bat | 1 + 3 files changed, 29 insertions(+), 19 deletions(-) ----------------------------------------------------------------------