[Pkg-voip-commits] [janus] 04/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 f28d8b32205dfd893fa8436f8705303e90e74f7f
Merge: 6a8236f ef4a07b
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Jun 22 11:05:19 2017 +0200

    Merge branch 'master' into vp9-svc

 conf/janus.cfg.sample.in                     |  10 +-
 conf/janus.eventhandler.sampleevh.cfg.sample |   3 +-
 conf/janus.transport.http.cfg.sample.in      |   5 +-
 dtls.c                                       |  23 ++--
 events/janus_sampleevh.c                     |   5 +-
 html/admin.js                                | 199 ++++++++++++++++++++++++---
 ice.c                                        | 159 ++++++++++++++++-----
 ice.h                                        |  12 +-
 janus.c                                      |  18 +++
 mainpage.dox                                 |  10 +-
 plugins/janus_sip.c                          |  11 +-
 transports/janus_http.c                      |  22 ++-
 12 files changed, 397 insertions(+), 80 deletions(-)

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