[Pkg-voip-commits] [janus] 159/282: Merge branch 'master' into iceloop-sessions-mgmt

[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 4fbbcf47e03306b727423d37363f333e1b0274d2
Merge: 3826d16 6d98a5e
Author: Alessandro Toppi <atoppi at meetecho.com>
Date:   Fri Oct 27 15:31:44 2017 +0200

    Merge branch 'master' into iceloop-sessions-mgmt

 dtls.c                   |  4 ++--
 html/devicetest.js       |  4 ++--
 html/echotest.js         |  4 ++--
 html/sipretest.js        |  2 +-
 html/siptest.js          |  2 +-
 html/streamingtest.js    |  8 ++++----
 html/videocalltest.js    |  4 ++--
 html/videoroomtest.js    | 12 +++++++-----
 html/vp9svctest.js       |  2 +-
 ice.c                    | 16 +++++++++++++---
 plugins/janus_echotest.c |  1 -
 11 files changed, 35 insertions(+), 24 deletions(-)


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