[Pkg-voip-commits] [janus] 06/282: Merge branch 'sdputils-pt2' 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 785564cfb183653a1ce3171bb1f2b13c31805f02
Merge: 4550d89 63e1258
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Fri Mar 3 12:09:55 2017 +0100

    Merge branch 'sdputils-pt2' into nosip

 README.md                   |   2 +-
 configure.ac                |   5 ++
 dtls.c                      | 146 ++++++++++++-----------------------------
 dtls.h                      |  21 +-----
 ice.c                       |  12 ++--
 janus.c                     |   1 +
 plugins/janus_audiobridge.c |  31 +--------
 plugins/janus_sip.c         | 150 +++++-------------------------------------
 plugins/janus_streaming.c   |  57 ++--------------
 plugins/janus_videoroom.c   |  73 ++-------------------
 rtp.c                       | 156 ++++++++++++++++++++++++++++++++++++++++++++
 rtp.h                       |  49 ++++++++++++++
 12 files changed, 294 insertions(+), 409 deletions(-)


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