You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cordova.apache.org by st...@apache.org on 2013/12/06 02:30:44 UTC

[15/16] git commit: fixed merge issues

fixed merge issues


Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/74ce9f5d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/74ce9f5d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/74ce9f5d

Branch: refs/heads/master
Commit: 74ce9f5da1c1da5a1012ecd3d6ebf92c4fa7a5db
Parents: ba47aa7 a91732d
Author: Steven Gill <st...@gmail.com>
Authored: Thu Dec 5 17:12:54 2013 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Dec 5 17:12:54 2013 -0800

----------------------------------------------------------------------

----------------------------------------------------------------------