[Pkg-voip-commits] [janus] 208/282: Merge branch 'master' into icesend-perf

[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 3e529461a36c5247cbc7ec83cac9434f8638c930
Merge: d708757 11282b3
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue Nov 28 15:27:34 2017 +0100

    Merge branch 'master' into icesend-perf

 README.md                     |  7 +++--
 bower.json                    |  4 +--
 certs/README.md               |  6 +++-
 configure.ac                  | 26 +++++++++---------
 dtls-bio.c                    | 18 ++++++------
 dtls-bio.h                    |  7 +++++
 dtls.c                        |  6 ++--
 html/janus.js                 |  2 +-
 ice.c                         | 18 +++---------
 janus.c                       |  2 +-
 mainpage.dox                  |  5 ++++
 plugins/janus_audiobridge.c   |  1 +
 plugins/janus_streaming.c     | 64 +++++++++++++++++++++++++------------------
 plugins/janus_videoroom.c     | 14 +++++++++-
 postprocessing/janus-pp-rec.c | 34 ++++++++++++++++++-----
 sdp.c                         | 41 +++++++++++++++------------
 transports/janus_websockets.c |  2 ++
 17 files changed, 158 insertions(+), 99 deletions(-)


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