cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [07/13] cordova-plugin-media git commit: Merge remote-tracking branch 'refs/remotes/apache/master' into avplayer_streaming
Date Fri, 29 Jan 2016 23:48:09 GMT
Merge remote-tracking branch 'refs/remotes/apache/master' into avplayer_streaming

# Conflicts:
#	plugin.xml
simple conflict on version with my branches previous version bump.
Resolved to match master.


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/023b2a07
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/tree/023b2a07
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/diff/023b2a07

Branch: refs/heads/master
Commit: 023b2a07d7e955fc10771e3d735748e408e56149
Parents: 45afc8a 8c74615
Author: ghenry22 <ghenry22@gmail.com>
Authored: Thu Nov 26 09:47:44 2015 +0800
Committer: ghenry22 <ghenry22@gmail.com>
Committed: Thu Nov 26 09:47:44 2015 +0800

----------------------------------------------------------------------
 CONTRIBUTING.md               |   2 +-
 README.md                     |   5 +
 RELEASENOTES.md               | 217 ++++++++++++++++++-----------------
 package.json                  |   2 +-
 plugin.xml                    |   7 +-
 src/android/AudioHandler.java |  70 +++++++++++-
 src/android/AudioPlayer.java  |  22 +++-
 src/ios/CDVSound.m            |  33 +++---
 src/windows/MediaProxy.js     | 225 +++++++++++++++++++++++++++++++------
 src/wp/AudioPlayer.cs         |   2 +-
 src/wp/Media.cs               |   4 +-
 tests/plugin.xml              |   2 +-
 tests/tests.js                |  71 +++++++++++-
 13 files changed, 497 insertions(+), 165 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/023b2a07/src/ios/CDVSound.m
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message