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:57:37 UTC

[04/14] 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-media-capture/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/648f4546
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/648f4546
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/648f4546

Branch: refs/heads/master
Commit: 648f454649f6dfb756719226ef5c4d7bc5e7e989
Parents: 34cd79d f516d31
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 27 16:07:00 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 27 16:07:00 2014 -0500

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

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