[Pkg-voip-commits] [janus] 98/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 3b162a2cc32e01a9280cccb67bb6cd3abb547c3c
Merge: ed622c2 6a57112
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue Aug 1 16:02:55 2017 +0200

    Merge branch 'master' into nosip

 html/citeus.html           | 29 +++++++++++++++++
 html/videoroomtest.js      | 10 ++++--
 ice.c                      | 26 +++++----------
 janus.c                    | 57 +++++++++++++++++----------------
 janus.h                    |  4 +--
 plugins/janus_echotest.c   |  4 +--
 plugins/janus_recordplay.c |  2 +-
 plugins/janus_sip.c        | 11 +++++--
 plugins/janus_streaming.c  | 66 +++++++++++++++++++++++++++++---------
 plugins/janus_videocall.c  |  8 ++---
 plugins/janus_videoroom.c  | 80 +++++++++++++++++++++++++++++++++++-----------
 sdp-utils.c                | 18 +++++++++++
 sdp-utils.h                |  8 +++++
 utils.c                    |  6 ++--
 14 files changed, 234 insertions(+), 95 deletions(-)

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