You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/05/29 17:45:12 UTC

[13/13] android commit: Merge branch 'pluggable_webview' into 4.0.x

Merge branch 'pluggable_webview' into 4.0.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/b42faea2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/b42faea2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/b42faea2

Branch: refs/heads/4.0.x
Commit: b42faea2eb16279a1f324b3a768ed2f29d4e4543
Parents: 635a627 22b1959
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu May 29 11:20:35 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu May 29 11:20:35 2014 -0400

----------------------------------------------------------------------
 bin/node_modules/which/LICENSE                  |  23 ++++
 bin/node_modules/which/README.md                |   5 +
 bin/node_modules/which/bin/which                |  14 +++
 bin/node_modules/which/package.json             |  31 ++++++
 bin/node_modules/which/which.js                 | 104 +++++++++++++++++++
 bin/templates/cordova/lib/build.js              |   7 ++
 .../src/org/apache/cordova/AndroidWebView.java  |   2 +-
 .../src/org/apache/cordova/CordovaWebView.java  |  16 ++-
 package.json                                    |   3 +-
 9 files changed, 199 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b42faea2/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------