[Pkg-voip-commits] [janus] 92/282: Merge branch 'master' into sipre

[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 1dd001a6e20133edd96364be8acf8d6deeba40f9
Merge: 32830eb 5f5b80d
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed Jul 26 18:35:42 2017 +0200

    Merge branch 'master' into sipre

 apierror.c                    |  1 -
 config.c                      | 31 +++++++-------
 configure.ac                  |  4 ++
 events.c                      |  1 +
 ice.c                         | 48 ++++++++++++++-------
 ice.h                         |  8 ++++
 ip-utils.c                    |  3 +-
 janus.c                       | 10 +++--
 plugins/janus_audiobridge.c   | 24 ++++-------
 plugins/janus_echotest.c      |  8 ++--
 plugins/janus_recordplay.c    | 35 +++++++++-------
 plugins/janus_sip.c           | 98 +++++++++++++++++++++++++++++++++++--------
 plugins/janus_streaming.c     | 86 +++++++++++++++++++++----------------
 plugins/janus_textroom.c      | 18 ++++----
 plugins/janus_videocall.c     | 16 +++----
 plugins/janus_videoroom.c     | 41 +++++++++++-------
 plugins/janus_voicemail.c     |  2 +-
 postprocessing/pp-g711.c      |  1 +
 postprocessing/pp-webm.c      |  2 +-
 rtcp.c                        | 34 ++++++++-------
 rtcp.h                        |  8 ++--
 rtp.c                         | 18 +-------
 sdp-utils.c                   |  6 ---
 transports/janus_http.c       | 20 +++++++--
 transports/janus_pfunix.c     |  3 +-
 transports/janus_rabbitmq.c   |  2 +-
 transports/janus_websockets.c |  4 ++
 27 files changed, 319 insertions(+), 213 deletions(-)


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