...and fixing conflict
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/2d4ab6cf Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/2d4ab6cf Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/2d4ab6cf Branch: refs/heads/master Commit: 2d4ab6cf517bca82d37e89293dc462f6f71a1b2c Parents: 95745c2 b5ba62d Author: Anis Kadri <[email protected]> Authored: Wed Sep 11 16:27:32 2013 -0700 Committer: Anis Kadri <[email protected]> Committed: Wed Sep 11 16:27:32 2013 -0700 ---------------------------------------------------------------------- plugman.js | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/2d4ab6cf/plugman.js ---------------------------------------------------------------------- diff --cc plugman.js index bcd0044,b9748ac..240e0db --- a/plugman.js +++ b/plugman.js @@@ -40,6 -32,18 +32,19 @@@ plugman = removeAllListeners: emitter.removeAllListeners, emit: emitter.emit }; + addProperty(plugman, 'help', './src/help'); + addProperty(plugman, 'install', './src/install'); + addProperty(plugman, 'uninstall', './src/uninstall'); + addProperty(plugman, 'fetch', './src/fetch'); + addProperty(plugman, 'prepare', './src/prepare'); + addProperty(plugman, 'config', './src/config'); ++addProperty(plugman, 'owner', './src/owner'); + addProperty(plugman, 'adduser', './src/adduser'); + addProperty(plugman, 'publish', './src/publish'); + addProperty(plugman, 'unpublish', './src/unpublish'); + addProperty(plugman, 'search', './src/search'); + addProperty(plugman, 'info', './src/info'); + addProperty(plugman, 'config_changes', './src/util/config-changes'); plugman.commands = { 'config' : function(cli_opts) {
