[Pkg-voip-commits] [janus] 31/163: Merge branch 'master' into js-track

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.

commit 7fc64a52df9cfb0523c34afe09a929492c56e102
Merge: db17ede ad2c131
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue Jul 25 12:44:34 2017 +0200

    Merge branch 'master' into js-track

 Makefile.am                 |  8 ++++-
 configure.ac                | 11 +++++-
 dtls-bio.c                  | 18 +++++-----
 dtls.c                      |  8 +++--
 html/janus.js               | 27 +++++++-------
 html/janus.nojquery.js      | 25 +++++++------
 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         | 85 +++++++++++++++++++++++++++++++++++++++++----
 plugins/janus_streaming.c   |  4 ++-
 plugins/janus_textroom.c    |  4 ++-
 plugins/janus_videocall.c   | 14 ++++++--
 plugins/janus_videoroom.c   |  8 ++++-
 plugins/janus_voicemail.c   |  4 ++-
 sdp-utils.c                 |  2 +-
 sdp.c                       | 11 ++++++
 transports/janus_http.c     |  2 ++
 20 files changed, 229 insertions(+), 107 deletions(-)


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