[Pkg-voip-commits] [janus] 33/163: Merge branch 'master' into vp9-svc

[Jonas Smedegaard]

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

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

commit 7c47ae9eed2991f119aba9e62a2e0b6c87c89ab9
Merge: 1d58b2d ad2c131
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue Jul 25 13:15:27 2017 +0200

    Merge branch 'master' into vp9-svc

 configure.ac                | 10 +++++++++-
 dtls-bio.c                  | 18 +++++++++---------
 dtls.c                      |  8 ++++++--
 html/janus.js               | 27 ++++++++++++++-------------
 html/janus.nojquery.js      | 25 ++++++++++++-------------
 ice.c                       | 39 ++++++++++++++++++++++++++++++++-------
 ice.h                       | 44 +-------------------------------------------
 plugins/janus_audiobridge.c |  4 +++-
 plugins/janus_echotest.c    |  4 +++-
 plugins/janus_recordplay.c  |  4 +++-
 plugins/janus_sip.c         | 42 +++++++++++++++++++++++++++++++++++++++---
 plugins/janus_streaming.c   |  4 +++-
 plugins/janus_textroom.c    |  4 +++-
 plugins/janus_videocall.c   |  4 ++++
 plugins/janus_videoroom.c   |  8 +++++++-
 plugins/janus_voicemail.c   |  4 +++-
 sdp.c                       | 11 +++++++++++
 17 files changed, 162 insertions(+), 98 deletions(-)


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