[Pkg-voip-commits] [janus] 86/282: Merge branch 'master' into nosip

[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 bdc3ad06ce00db6b7188311ff7eb5b8faf733d3c
Merge: 636790a ad2c131
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue Jul 25 12:45:08 2017 +0200

    Merge branch 'master' into nosip

 Makefile.am                 |   8 +-
 configure.ac                |  11 +-
 dtls-bio.c                  |  18 +--
 dtls.c                      |   8 +-
 html/janus.js               |  36 +++---
 html/janus.nojquery.js      |  38 +++---
 html/siptest.html           |   2 +
 html/siptest.js             |  11 ++
 ice.c                       |  39 +++++-
 ice.h                       |  44 +------
 plugins/janus_audiobridge.c |   4 +-
 plugins/janus_echotest.c    |  14 +-
 plugins/janus_recordplay.c  |   4 +-
 plugins/janus_sip.c         | 309 ++++++++++++++++++++++++++++++++++++++++----
 plugins/janus_streaming.c   |   4 +-
 plugins/janus_textroom.c    |   7 +-
 plugins/janus_videocall.c   |  14 +-
 plugins/janus_videoroom.c   |   8 +-
 plugins/janus_voicemail.c   |   4 +-
 sdp-utils.c                 |   4 +-
 sdp.c                       |  11 ++
 transports/janus_http.c     |   2 +
 22 files changed, 459 insertions(+), 141 deletions(-)


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