incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [2/5] android commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView
Date Fri, 13 Apr 2012 20:00:52 GMT
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 <bowserj@apache.org>
Authored: Fri Apr 13 11:14:20 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
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
----------------------------------------------------------------------


Mime
View raw message