[Pkg-voip-commits] [janus] 06/163: Merge branch 'master' into vp9-svc

[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 308b9912ad1e1ad21d33f9206c4fb95e35509471
Merge: 06f364a cad85c9
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue Jun 27 14:32:02 2017 +0200

    Merge branch 'master' into vp9-svc

 html/devicetest.js     |   7 +--
 html/echotest.js       |   3 +-
 html/janus.js          | 109 +++++++++++-------------------------
 html/janus.nojquery.js | 108 ++++++++++--------------------------
 html/siptest.js        |  21 +++++--
 html/videocalltest.js  |   3 +-
 html/videoroomtest.js  |   3 +-
 plugins/janus_sip.c    | 146 +++++++++++++++++++++++++++++++------------------
 8 files changed, 181 insertions(+), 219 deletions(-)

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