Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/7e15ff93 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7e15ff93 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7e15ff93 Branch: refs/heads/master Commit: 7e15ff930d7520b74a5e91f99b71d0e12be2d27e Parents: b83610a 9cb1483 Author: Joe Bowser <[email protected]> Authored: Mon Jun 24 11:31:47 2013 -0700 Committer: Joe Bowser <[email protected]> Committed: Mon Jun 24 11:31:47 2013 -0700 ---------------------------------------------------------------------- bin/templates/cordova/run | 2 +- .../src/org/apache/cordova/ExposedJsApi.java | 4 +- .../src/org/apache/cordova/api/PluginEntry.java | 13 +++++ .../org/apache/cordova/api/PluginManager.java | 59 +++++++++++++++++--- 4 files changed, 66 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
