[Pkg-voip-commits] [janus] 50/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 d37db07dc53cdd45217720c89b26c044729cfab8
Merge: 07bc8b0 8b388ae
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon May 29 15:35:37 2017 +0200

    Merge branch 'master' into sipre

 html/janus.js             |  11 ++--
 html/janus.nojquery.js    |  11 ++--
 ice.c                     | 128 ++++++++++++++++++++++++++++------------------
 ice.h                     |   1 +
 plugins/janus_streaming.c |  39 ++++++++------
 rtcp.c                    |   9 +++-
 transports/janus_http.c   |  16 ++++++
 7 files changed, 137 insertions(+), 78 deletions(-)

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