[Pkg-owncloud-commits] [owncloud] 04/07: Merge pull request #2809 from owncloud/bump_jplayer

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.0.14
in repository owncloud.

commit a8acec20303a871eb026f5505482ce77c998842f
Merge: ee8d198 60f6bfa
Author: Lukas Reschke <lukas at statuscode.ch>
Date:   Tue Apr 9 15:02:38 2013 -0700

    Merge pull request #2809 from owncloud/bump_jplayer
    
    Bump jplayer

 apps/media/js/Jplayer.swf                          |  Bin 7679 -> 13742 bytes
 .../add-on/jplayer.playlist.js                     |  452 ----
 .../add-on/jquery.jplayer.inspector.js             |  331 ---
 .../jQuery.jPlayer.2.1.0.source/jquery.jplayer.js  | 2349 --------------------
 .../Jplayer.as                                     | 1023 +++++----
 .../Jplayer.fla                                    |  Bin 61952 -> 61952 bytes
 .../happyworm/jPlayer/ConnectManager.as            |  296 +++
 .../happyworm/jPlayer/JplayerEvent.as              |  136 +-
 .../happyworm/jPlayer/JplayerMp3.as                |  656 +++---
 .../happyworm/jPlayer/JplayerMp4.as                |  826 +++----
 .../happyworm/jPlayer/JplayerRtmp.as               |  984 ++++++++
 .../happyworm/jPlayer/JplayerStatus.as             |  208 +-
 .../happyworm/jPlayer/TraceOut.as                  |   63 +
 13 files changed, 2867 insertions(+), 4457 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git