[Pkg-voip-commits] [janus] 26/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 732ec87386ff889208ca25a26b31a4d3281d8997
Merge: 8a0838f bf37ced
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed Apr 19 15:42:57 2017 +0200

    Merge branch 'master' into nosip

 .gitignore                               |   1 +
 Makefile.am                              |  23 ++-
 README.md                                |   5 +-
 conf/janus.plugin.audiobridge.cfg.sample |   3 +
 conf/janus.plugin.videoroom.cfg.sample   |   5 +
 ice.c                                    |   4 +-
 janus.c                                  |  11 +-
 plugins/janus_audiobridge.c              | 153 ++++++++++++++-
 plugins/janus_sip.c                      | 138 +++++++++++---
 plugins/janus_streaming.c                | 314 +++++++++++++++++++++++--------
 plugins/janus_videoroom.c                | 250 ++++++++++++++++++++++--
 sdp-utils.c                              |  15 ++
 sdp-utils.h                              |   2 +
 version.h                                |  19 ++
 14 files changed, 815 insertions(+), 128 deletions(-)


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