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/02/20 20:25:44 UTC
[3/3] android commit: Merge branch 'next'
Updated Branches:
refs/heads/master cb192056f -> fdb3679cf
Merge branch 'next'
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/fdb3679c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/fdb3679c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/fdb3679c
Branch: refs/heads/master
Commit: fdb3679cf50fe771802a00a16319f3cd39e607f1
Parents: 11beb37 5cd1773
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Feb 20 11:25:32 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Feb 20 11:25:32 2013 -0800
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/project/assets/www/index.html | 2 +-
framework/assets/js/cordova.android.js | 622 +++++++++------------
framework/assets/www/index.html | 2 +-
framework/src/org/apache/cordova/Device.java | 2 +-
5 files changed, 262 insertions(+), 368 deletions(-)
----------------------------------------------------------------------