cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [12/15] git commit: Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-media into dev
Date Thu, 26 Sep 2013 22:27:21 GMT
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/master
Commit: 2325bcde076b184b86b84a28612205e1ceddfaf8
Parents: e88e3e4 5cbe86a
Author: Anis Kadri <anis@apache.org>
Authored: Wed Sep 25 17:05:46 2013 +0200
Committer: Anis Kadri <anis@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
----------------------------------------------------------------------


Mime
View raw message