Updated Branches: refs/heads/master eb66eb02c -> fc50a0d95
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/master Commit: fc50a0d954646bb09c437c59091c7eaf5f5959c7 Parents: c634966 eb66eb0 Author: Joe Bowser <bows...@apache.org> Authored: Fri May 11 16:08:06 2012 -0700 Committer: Joe Bowser <bows...@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(-) ----------------------------------------------------------------------
