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/05/13 20:50:34 UTC

[13/13] ios commit: MERGE CONFLICTS

MERGE CONFLICTS


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/32397ff0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/32397ff0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/32397ff0

Branch: refs/heads/3.0.0
Commit: 32397ff06fb09de0f47c0ce4e2a4ad71b29f141f
Parents: e292c05 9d30ff3
Author: Steven Gill <st...@gmail.com>
Authored: Mon May 13 11:40:17 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon May 13 11:40:17 2013 -0700

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

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