[Pkg-voip-commits] [janus] 106/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 9f37ebeb09aa708577705d1883c63aa3efaabd81
Merge: 35c4688 d77b31a
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon Sep 4 15:58:10 2017 +0200

    Merge branch 'master' into sipre

 Makefile.am                                   |   2 +-
 conf/janus.plugin.streaming.cfg.sample.in     |   6 ++
 conf/janus.transport.websockets.cfg.sample.in |   3 +
 html/janus.js                                 |   2 +-
 html/janus.nojquery.js                        |   2 +-
 janus.c                                       | 117 ++++++++++++--------------
 janus.h                                       |   4 +-
 plugins/janus_streaming.c                     |  62 ++++++++++----
 rtcp.c                                        |   2 +-
 transports/janus_websockets.c                 |  55 ++++++++++++
 10 files changed, 170 insertions(+), 85 deletions(-)


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