[Pkg-voip-commits] [janus] 09/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 bf0ba5a5b79249f892cc75bcc19f25bbe01a6d0b
Merge: 61bbe67 aed78cc
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed Mar 8 12:38:31 2017 +0100

    Merge branch 'sdputils-pt2' into nosip

 README.md                                 |  42 +++----
 conf/janus.plugin.streaming.cfg.sample.in |   5 +
 configure.ac                              |  22 ++--
 docs/janus-doxygen.cfg                    |   2 +-
 html/janus.js                             |  19 ++-
 html/janus.nojquery.js                    |  37 ++++--
 ice.c                                     |  48 +++++---
 ip-utils.c                                | 184 +++++++++++++++++++++++++-----
 ip-utils.h                                | 115 ++++++++++++++-----
 janus.c                                   | 133 ++++++++-------------
 mainpage.dox                              |   3 +-
 plugins/janus_sip.c                       |  87 ++++----------
 plugins/janus_streaming.c                 |  52 +++------
 transports/janus_http.c                   |  70 +++++++++---
 transports/janus_pfunix.c                 |   2 +
 turnrest.c                                |  15 ++-
 utils.c                                   |  66 -----------
 utils.h                                   |  18 ---
 18 files changed, 510 insertions(+), 410 deletions(-)


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