[Pkg-voip-commits] [janus] 24/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 38e12868c1aac3e6db2c9c5f57309f34d225b3bc
Merge: 1066229 c1537a6
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon Apr 10 12:54:40 2017 +0200

    Merge branch 'master' into nosip

 .gitignore                                         |   1 +
 Makefile.am                                        |   6 +-
 README.md                                          |   8 +-
 conf/janus.cfg.sample.in                           |  18 +-
 conf/janus.plugin.audiobridge.cfg.sample           |   2 +-
 conf/janus.plugin.videoroom.cfg.sample             |   2 +-
 ...sample => janus.plugin.voicemail.cfg.sample.in} |   2 +-
 conf/janus.transport.pfunix.cfg.sample             |   9 +-
 conf/janus.transport.rabbitmq.cfg.sample           |   7 +
 configure.ac                                       |   2 +-
 docs/footer.html                                   |   4 +-
 html/echotest.html                                 |   2 +-
 html/janus.js                                      |  10 +-
 html/janus.nojquery.js                             |   4 +-
 ice.c                                              |  37 ++--
 ice.h                                              |   6 +-
 mainpage.dox                                       |  16 +-
 plugins/janus_audiobridge.c                        |  15 +-
 plugins/janus_recordplay.c                         |   6 +-
 plugins/janus_sip.c                                |  29 +--
 plugins/janus_streaming.c                          | 232 ++++++++++++++-------
 plugins/janus_textroom.c                           |   8 +
 plugins/janus_videocall.c                          |   3 -
 plugins/janus_videoroom.c                          |  57 +++--
 sctp.c                                             |   9 +-
 transports/janus_http.c                            |  33 +--
 transports/janus_mqtt.c                            |  12 +-
 transports/janus_pfunix.c                          |  43 +++-
 transports/janus_rabbitmq.c                        |  80 ++++++-
 transports/janus_websockets.c                      |   2 +-
 30 files changed, 432 insertions(+), 233 deletions(-)


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