You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/01/30 00:21:01 UTC
[2/5] android commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-android into puritytool
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android into puritytool
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/23f57ad5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/23f57ad5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/23f57ad5
Branch: refs/heads/master
Commit: 23f57ad5a7a33e0ea3e03233bb0bc2d41e5eb4f8
Parents: 66f15fd d9b15cf
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Jan 21 14:59:04 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Jan 21 14:59:04 2013 -0800
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/project/Activity.java | 1 -
bin/templates/project/assets/www/index.html | 2 +-
framework/assets/js/cordova.android.js | 936 ++++++++++---------
framework/assets/www/index.html | 2 +-
framework/src/org/apache/cordova/Device.java | 2 +-
framework/src/org/apache/cordova/DroidGap.java | 2 +-
7 files changed, 510 insertions(+), 437 deletions(-)
----------------------------------------------------------------------