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 19C539D0E for ; Fri, 13 Apr 2012 20:00:53 +0000 (UTC) Received: (qmail 94860 invoked by uid 500); 13 Apr 2012 20:00:53 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 94796 invoked by uid 500); 13 Apr 2012 20:00:53 -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 94769 invoked by uid 99); 13 Apr 2012 20:00:53 -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, 13 Apr 2012 20:00:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BD8B5CE5D; Fri, 13 Apr 2012 20:00:52 +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: [2/5] android commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView Message-Id: <20120413200052.BD8B5CE5D@tyr.zones.apache.org> Date: Fri, 13 Apr 2012 20:00:52 +0000 (UTC) Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView 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/fea79bc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/fea79bc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/fea79bc9 Branch: refs/heads/CordovaWebView Commit: fea79bc971d60f012fd008eb307c387c2c00db31 Parents: f2526bb eb48055 Author: Joe Bowser Authored: Fri Apr 13 11:14:20 2012 -0700 Committer: Joe Bowser Committed: Fri Apr 13 11:14:20 2012 -0700 ---------------------------------------------------------------------- VERSION | 2 +- .../templates/project/assets/www/index.html | 10 ++-- .../cordova/templates/project/res/xml/cordova.xml | 34 ++++++++++++++- .../cordova/templates/project/res/xml/plugins.xml | 20 ++++++++- framework/assets/js/cordova.android.js | 4 +- framework/assets/www/index.html | 2 +- framework/src/org/apache/cordova/Device.java | 2 +- 7 files changed, 63 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/fea79bc9/framework/src/org/apache/cordova/Device.java ----------------------------------------------------------------------