[Pkg-voip-commits] [janus] 102/282: Merge branch 'master' into nosip

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.

commit 84df3a662efd618a287393814e8991f17e60df3c
Merge: d318caf 23ca42e
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Fri Sep 1 11:41:50 2017 +0200

    Merge branch 'master' into nosip

 html/audiobridgetest.html     |  2 +-
 html/audiobridgetest.js       |  4 +--
 html/devicetest.html          |  2 +-
 html/devicetest.js            | 54 ++++++++++++++++++++------------------
 html/echotest.html            |  2 +-
 html/echotest.js              | 45 ++++++++++++++++++-------------
 html/janus.js                 | 28 ++++++--------------
 html/janus.nojquery.js        | 28 ++++++--------------
 html/recordplaytest.html      |  2 +-
 html/recordplaytest.js        | 28 +++++++++++---------
 html/screensharingtest.html   |  2 +-
 html/screensharingtest.js     | 16 +++++++-----
 html/siptest.html             |  2 +-
 html/siptest.js               | 61 +++++++++++++++++++++++++------------------
 html/streamingtest.html       |  2 +-
 html/streamingtest.js         | 31 ++++++++++++++++++----
 html/textroomtest.html        |  2 +-
 html/textroomtest.js          |  2 +-
 html/videocalltest.html       |  2 +-
 html/videocalltest.js         | 24 ++++++++++++-----
 html/videoroomtest.html       |  2 +-
 html/videoroomtest.js         | 29 +++++++++++++-------
 html/voicemailtest.html       |  2 +-
 html/voicemailtest.js         |  2 +-
 html/vp9svctest.html          |  2 +-
 html/vp9svctest.js            | 29 +++++++++++++-------
 ice.c                         | 25 +++++++++++++++++-
 ice.h                         |  4 +++
 mutex.h                       |  2 ++
 plugins/janus_audiobridge.c   | 11 +++-----
 plugins/janus_echotest.c      |  3 +--
 plugins/janus_recordplay.c    |  6 ++---
 plugins/janus_sip.c           |  3 +--
 plugins/janus_streaming.c     |  8 ++----
 plugins/janus_textroom.c      |  9 +++----
 plugins/janus_videocall.c     |  3 +--
 plugins/janus_videoroom.c     | 31 +++++++++++-----------
 plugins/janus_voicemail.c     |  3 +--
 sdp.c                         | 10 +++++++
 transports/janus_http.c       |  3 +--
 transports/janus_pfunix.c     |  3 +--
 transports/janus_websockets.c |  3 +--
 turnrest.c                    |  3 +--
 43 files changed, 303 insertions(+), 232 deletions(-)

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