You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2012/07/28 03:31:14 UTC
[1/2] android commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
Updated Branches:
refs/heads/master 3d53b9244 -> 563fa46ba
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/563fa46b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/563fa46b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/563fa46b
Branch: refs/heads/master
Commit: 563fa46ba403b41ca2ec91a15f731a01f64734e0
Parents: 7865c06 3d53b92
Author: Anis Kadri <an...@gmail.com>
Authored: Fri Jul 27 18:30:59 2012 -0700
Committer: Anis Kadri <an...@gmail.com>
Committed: Fri Jul 27 18:30:59 2012 -0700
----------------------------------------------------------------------
bin/templates/project/AndroidManifest.xml | 6 +-
framework/AndroidManifest.xml | 2 +-
.../src/org/apache/cordova/CordovaWebView.java | 8 +++-
framework/src/org/apache/cordova/DroidGap.java | 15 ++++++
framework/src/org/apache/cordova/FileTransfer.java | 39 ++++++++++-----
5 files changed, 52 insertions(+), 18 deletions(-)
----------------------------------------------------------------------