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 2014/07/10 21:06:21 UTC
[3/3] android commit: Merge branch 'master' into 4.0.x
(CordovaPlugin.pluginInitialize tweak)
Merge branch 'master' into 4.0.x (CordovaPlugin.pluginInitialize tweak)
Conflicts:
framework/src/org/apache/cordova/CordovaPlugin.java
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/1d4aa44d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/1d4aa44d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/1d4aa44d
Branch: refs/heads/4.0.x
Commit: 1d4aa44d3d9eef574100f4e3c2fd2a92a0e1d9c8
Parents: b52fcb8 3792f75
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Jul 10 15:05:40 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Jul 10 15:05:40 2014 -0400
----------------------------------------------------------------------
.../src/org/apache/cordova/CordovaPlugin.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1d4aa44d/framework/src/org/apache/cordova/CordovaPlugin.java
----------------------------------------------------------------------