You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2013/01/11 18:14:03 UTC
[4/4] android commit: Merge branch 'master' into start_location
Updated Branches:
refs/heads/master dbb127447 -> e14edf134
Merge branch 'master' into start_location
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e14edf13
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e14edf13
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e14edf13
Branch: refs/heads/master
Commit: e14edf134d8d00d401d00062653b78dbd34c0be4
Parents: 913e177 dbb1274
Author: Braden Shepherdson <br...@chromium.org>
Authored: Fri Jan 11 12:13:43 2013 -0500
Committer: Braden Shepherdson <br...@chromium.org>
Committed: Fri Jan 11 12:13:43 2013 -0500
----------------------------------------------------------------------
bin/create | 2 +-
framework/src/org/apache/cordova/App.java | 10 +------
.../src/org/apache/cordova/CameraLauncher.java | 3 +-
framework/src/org/apache/cordova/DroidGap.java | 9 +++---
framework/src/org/apache/cordova/FileTransfer.java | 3 +-
framework/src/org/apache/cordova/FileUtils.java | 22 +++++++++-----
.../org/apache/cordova/api/CordovaInterface.java | 5 ---
.../src/org/apache/cordova/api/LegacyContext.java | 3 +-
8 files changed, 26 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e14edf13/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e14edf13/framework/src/org/apache/cordova/FileTransfer.java
----------------------------------------------------------------------