[Pkg-voip-commits] [janus] 38/163: Merge branch 'master' into vp8-simulcast

[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 f9de4cd25178e589bf42a070a072a5f31b6013ba
Merge: 8a7de5f 623d0ce
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Jul 27 12:54:26 2017 +0200

    Merge branch 'master' into vp8-simulcast

 conf/janus.transport.http.cfg.sample.in |  9 ++++
 plugins/janus_videoroom.c               | 12 ------
 transports/janus_http.c                 | 75 ++++++++++++++++++++++++++-------
 3 files changed, 68 insertions(+), 28 deletions(-)


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