[Pkg-voip-commits] [janus] 29/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 7d935e023d620056a22514f75d462dcd6492e8d0
Merge: 308b991 1f40218
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed Jul 12 17:51:41 2017 +0200

    Merge branch 'master' into vp9-svc

 Makefile.am               |   8 +-
 configure.ac              |   1 +
 html/janus.js             |   9 +-
 html/janus.nojquery.js    |  13 ++-
 html/siptest.html         |   2 +
 html/siptest.js           |  11 ++
 plugins/janus_echotest.c  |  10 +-
 plugins/janus_sip.c       | 271 +++++++++++++++++++++++++++++++++++++++++-----
 plugins/janus_textroom.c  |   3 +-
 plugins/janus_videocall.c |  10 +-
 sdp-utils.c               |   4 +-
 transports/janus_http.c   |   2 +
 12 files changed, 299 insertions(+), 45 deletions(-)

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