You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2013/09/25 17:06:01 UTC
[3/3] git commit: Merge branch 'dev' of
https://git-wip-us.apache.org/repos/asf/cordova-plugin-media into dev
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-media into dev
Conflicts:
src/windows8/MediaProxy.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/commit/2325bcde
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/2325bcde
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/2325bcde
Branch: refs/heads/dev
Commit: 2325bcde076b184b86b84a28612205e1ceddfaf8
Parents: e88e3e4 5cbe86a
Author: Anis Kadri <an...@apache.org>
Authored: Wed Sep 25 17:05:46 2013 +0200
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Sep 25 17:05:46 2013 +0200
----------------------------------------------------------------------
src/windows8/MediaProxy.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/2325bcde/src/windows8/MediaProxy.js
----------------------------------------------------------------------