You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2013/12/09 21:20:10 UTC
[1/2] git commit: CB-5569 Windows8. MediaFile constructor does not
exist
Updated Branches:
refs/heads/dev 7184efe7a -> 9f7a35663
CB-5569 Windows8. MediaFile constructor does not exist
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/6e298604
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/6e298604
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/6e298604
Branch: refs/heads/dev
Commit: 6e29860429b3206723a575a08e25c6724a014a6a
Parents: 5f50ac7
Author: sgrebnov <se...@gmail.com>
Authored: Wed Dec 4 17:02:45 2013 +0400
Committer: sgrebnov <se...@gmail.com>
Committed: Wed Dec 4 17:02:45 2013 +0400
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/6e298604/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index cd22f66..7f141f7 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -135,7 +135,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"
<platform name="windows8">
<js-module src="src/windows8/MediaFile.js" name="MediaFile2">
- <clobbers target="MediaFile" />
+ <merges target="MediaFile" />
</js-module>
<js-module src="src/windows8/CaptureProxy.js" name="CaptureProxy">
[2/2] git commit: Merge branch 'CB-5569' of
https://github.com/sgrebnov/cordova-plugin-media-capture into dev
Posted by pu...@apache.org.
Merge branch 'CB-5569' of https://github.com/sgrebnov/cordova-plugin-media-capture into dev
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/9f7a3566
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/9f7a3566
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/9f7a3566
Branch: refs/heads/dev
Commit: 9f7a356632f361ad4e8824f9489e824ee0d66a7f
Parents: 7184efe 6e29860
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Dec 9 12:19:50 2013 -0800
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Dec 9 12:19:50 2013 -0800
----------------------------------------------------------------------
plugin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/9f7a3566/plugin.xml
----------------------------------------------------------------------