[Pkg-voip-commits] [janus] 125/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 932dd62f86c632fec45f912bd996ac3ae2806748
Merge: 079cc48 e644cfa
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Fri Oct 13 11:55:25 2017 +0200

    Merge branch 'master' into nosip

 Makefile.am                   |  3 ++-
 dtls.c                        |  1 -
 dtls.h                        |  1 +
 ice.c                         | 20 +++++++++----------
 plugins/janus_audiobridge.c   |  8 ++++----
 plugins/janus_echotest.c      |  4 ++--
 plugins/janus_recordplay.c    | 14 ++++++-------
 plugins/janus_sip.c           | 30 +++++++++++++++-------------
 plugins/janus_streaming.c     | 14 ++++++-------
 plugins/janus_videocall.c     |  4 ++--
 plugins/janus_videoroom.c     |  4 ++--
 plugins/janus_voicemail.c     |  2 +-
 rtp.c                         |  7 ++++---
 rtp.h                         | 32 ++----------------------------
 rtpsrtp.h                     | 46 +++++++++++++++++++++++++++++++++++++++++++
 transports/janus_websockets.c |  8 +++++---
 16 files changed, 111 insertions(+), 87 deletions(-)


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