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 A54A29859 for ; Wed, 25 Jan 2012 04:36:11 +0000 (UTC) Received: (qmail 62385 invoked by uid 500); 25 Jan 2012 04:36:11 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 62343 invoked by uid 500); 25 Jan 2012 04:36:10 -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 62307 invoked by uid 99); 25 Jan 2012 04:36:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2012 04:36:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jan 2012 04:36:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D64D6319750; Wed, 25 Jan 2012 04:35:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bcurtis@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [3/5] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android Message-Id: <20120125043545.D64D6319750@tyr.zones.apache.org> Date: Wed, 25 Jan 2012 04:35:45 +0000 (UTC) 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/20891aee Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/20891aee Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/20891aee Branch: refs/heads/master Commit: 20891aee1a73503d0a7775bcb3261a1ae19f2e2f Parents: f9af33b e8544d3 Author: Bryce Curtis Authored: Mon Jan 23 21:10:40 2012 -0600 Committer: Bryce Curtis Committed: Mon Jan 23 21:10:40 2012 -0600 ---------------------------------------------------------------------- README.md | 10 ++++++++++ framework/res/xml/phonegap.xml | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 1 deletions(-) ----------------------------------------------------------------------