[Pkg-voip-commits] [janus] 66/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 a63564fe6aeb30e0a5e0290ea28dcc8e63356254
Merge: b2bea58 58520fb
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Jun 8 13:16:47 2017 +0200

    Merge branch 'master' into sipre

 bower.json                  |  7 ++++---
 events.c                    |  5 +++--
 html/janus.js               |  5 +++++
 html/janus.nojquery.js      |  5 +++++
 ice.c                       |  8 ++++----
 ice.h                       |  4 ++++
 janus.c                     | 20 +++++++++++++++-----
 plugins/janus_audiobridge.c | 44 +++++++++++++++++++++++++++++++++++---------
 plugins/janus_sip.c         |  4 +++-
 plugins/janus_videoroom.c   | 39 ++++++++++++++++++++++++++++++++-------
 10 files changed, 110 insertions(+), 31 deletions(-)

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