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 2012/05/15 17:56:25 UTC

[4/6] android commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android

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/fc50a0d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/fc50a0d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/fc50a0d9

Branch: refs/heads/CordovaWebView
Commit: fc50a0d954646bb09c437c59091c7eaf5f5959c7
Parents: c634966 eb66eb0
Author: Joe Bowser <bo...@apache.org>
Authored: Fri May 11 16:08:06 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Fri May 11 16:08:06 2012 -0700

----------------------------------------------------------------------
 framework/assets/js/cordova.android.js          |   55 ++++++++++-------
 framework/project.properties                    |    2 +-
 framework/src/org/apache/cordova/DroidGap.java  |    4 +-
 framework/src/org/apache/cordova/FileUtils.java |    2 +-
 4 files changed, 36 insertions(+), 27 deletions(-)
----------------------------------------------------------------------