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

Posted to commits@cordova.apache.org by mm...@apache.org on 2013/02/25 14:41:00 UTC

[50/50] ios commit: Merge branch 'multipart_plugin_result' of http://git-wip-us.apache.org/repos/asf/cordova-ios into multipart_plugin_result

Updated Branches:
  refs/heads/multipart_plugin_result a394533f1 -> 105be9e65


Merge branch 'multipart_plugin_result' of http://git-wip-us.apache.org/repos/asf/cordova-ios into multipart_plugin_result

Conflicts:
	CordovaLib/Classes/CDVPluginResult.m


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

Branch: refs/heads/multipart_plugin_result
Commit: 105be9e659b0f0ccd2e1ae9acbd3d480587af8c2
Parents: 2d19cd0 a394533
Author: Michal Mocny <mm...@gmail.com>
Authored: Mon Feb 25 08:40:21 2013 -0500
Committer: Michal Mocny <mm...@gmail.com>
Committed: Mon Feb 25 08:40:21 2013 -0500

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

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