[Pkg-voip-commits] [janus] 76/282: Merge branch 'master' into sipre

[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 149af1719c8dfbc68d4e4570e905be83aa963b46
Merge: 6d3e251 ef4a07b
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Jun 22 11:03:37 2017 +0200

    Merge branch 'master' into sipre

 conf/janus.cfg.sample.in                     |  10 +-
 conf/janus.eventhandler.sampleevh.cfg.sample |   3 +-
 dtls.c                                       |  23 ++--
 events/janus_sampleevh.c                     |   5 +-
 html/admin.js                                | 199 ++++++++++++++++++++++++---
 ice.c                                        | 159 ++++++++++++++++-----
 ice.h                                        |  12 +-
 janus.c                                      |  18 +++
 mainpage.dox                                 |  10 +-
 9 files changed, 367 insertions(+), 72 deletions(-)

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