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/05/10 01:00:45 UTC
[43/43] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-cli
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli
Conflicts:
src/plugin_loader.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/51901bd9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/51901bd9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/51901bd9
Branch: refs/heads/master
Commit: 51901bd9f22127ca283df5fa4e06611cbb59359b
Parents: 164d064 72cca5e
Author: Anis Kadri <an...@gmail.com>
Authored: Thu May 9 15:57:04 2013 -0700
Committer: Anis Kadri <an...@gmail.com>
Committed: Thu May 9 15:57:04 2013 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------