incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [1/2] android commit: Merge conflict on the plugins
Date Thu, 06 Sep 2012 22:42:55 GMT
Updated Branches:
  refs/heads/master 48881d081 -> d4b248fbe


Merge conflict on the plugins


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/d4b248fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/d4b248fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/d4b248fb

Branch: refs/heads/master
Commit: d4b248fbe37236c6dda18e095b1a8816b682774e
Parents: 48881d0 8013b76
Author: Joe Bowser <bowserj@apache.org>
Authored: Thu Sep 6 15:26:38 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Thu Sep 6 15:26:38 2012 -0700

----------------------------------------------------------------------
 framework/res/xml/config.xml                       |   92 +++++++++++----
 .../src/org/apache/cordova/api/PluginManager.java  |   45 +++++++-
 2 files changed, 112 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d4b248fb/framework/src/org/apache/cordova/api/PluginManager.java
----------------------------------------------------------------------


Mime
View raw message