You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2013/07/28 02:55:52 UTC
[30/50] git commit: Merge branch 'plugman-registry' of
https://git-wip-us.apache.org/repos/asf/cordova-plugman into plugman-registry
Merge branch 'plugman-registry' of https://git-wip-us.apache.org/repos/asf/cordova-plugman into plugman-registry
Conflicts:
doc/help.txt
main.js
package.json
plugin_spec.md
plugman.js
src/fetch.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/5a22d2a4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/5a22d2a4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/5a22d2a4
Branch: refs/heads/master
Commit: 5a22d2a43f61fa5a98022d79429fc950f8c393fd
Parents: 93acf39 c9a42d6
Author: Anis Kadri <an...@apache.org>
Authored: Thu Jul 11 14:49:46 2013 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Jul 11 14:49:46 2013 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------