You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/06/28 18:01:09 UTC
[49/50] [abbrv] android commit: [CB-4048] Merge branch 'master' into
2.9.x
[CB-4048] Merge branch 'master' into 2.9.x
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/67e97a89
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/67e97a89
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/67e97a89
Branch: refs/heads/2.9.x
Commit: 67e97a89ced3aa5dddfc823ca7873af7328d40e8
Parents: c5e83b1 892ffc8
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jun 28 11:23:58 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jun 28 11:23:58 2013 -0400
----------------------------------------------------------------------
bin/update | 23 +-
framework/assets/www/cordova.js | 5357 ++----------------
framework/src/org/apache/cordova/Config.java | 24 +-
.../src/org/apache/cordova/CordovaActivity.java | 14 +
.../src/org/apache/cordova/CordovaWebView.java | 35 +-
.../src/org/apache/cordova/ExposedJsApi.java | 7 +-
.../src/org/apache/cordova/FileHelper.java | 33 +-
.../cordova/IceCreamCordovaWebViewClient.java | 49 +-
.../src/org/apache/cordova/UriResolver.java | 65 +
.../src/org/apache/cordova/UriResolvers.java | 277 +
.../org/apache/cordova/api/CordovaPlugin.java | 15 +-
.../src/org/apache/cordova/api/PluginEntry.java | 13 +
.../org/apache/cordova/api/PluginManager.java | 93 +-
.../apache/cordova/test/UriResolversTest.java | 263 +
.../actions/CordovaWebViewTestActivity.java | 2 +-
15 files changed, 1307 insertions(+), 4963 deletions(-)
----------------------------------------------------------------------