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

Posted to commits@cordova.apache.org by ia...@apache.org on 2014/04/23 20:56:18 UTC

[04/16] git commit: Merge branch 'master' into dev

Merge branch 'master' into dev

Conflicts:
	plugin.xml


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/2a752011
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/2a752011
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/2a752011

Branch: refs/heads/master
Commit: 2a7520112e6dec287b864861f695f3f3d9c47bfb
Parents: 61a963d 552b806
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 27 16:03:32 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 27 16:03:32 2014 -0500

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

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