[Pkg-voip-commits] [janus] 03/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 6a8236f1dc97ebc81c86fbaafcf5eb2d2f7d942d
Merge: 1182cf0 39fb903
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed Jun 14 17:45:17 2017 +0200

    Merge branch 'master' into vp9-svc

 README.md                 |   2 +-
 configure.ac              |   2 +-
 docs/janus-doxygen.cfg    |   2 +-
 html/audiobridgetest.js   |  12 ++-
 html/devicetest.js        |   5 ++
 html/echotest.js          |  13 ++-
 html/janus.js             |  25 ++++--
 html/janus.nojquery.js    |  25 ++++--
 html/screensharingtest.js |   4 +-
 html/siptest.html         |  13 +--
 html/siptest.js           |  36 +++++++-
 html/textroomtest.js      |  12 ++-
 html/videocalltest.js     |  13 ++-
 html/videoroomtest.js     |  24 ++++-
 ice.c                     |   4 +-
 ice.h                     |   4 +
 janus.c                   |  24 +++--
 janus.ggo                 |   1 +
 plugins/janus_sip.c       | 222 +++++++++++++++++++++++++++++-----------------
 19 files changed, 306 insertions(+), 137 deletions(-)

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