[Pkg-voip-commits] [janus] 99/282: Merge branch 'master' into sipre
Jonas Smedegaard
dr at jones.dk
Wed Dec 20 21:53:31 UTC 2017
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 cf60f936ab00829d13f82c64e34a7a053da495ee
Merge: b78ee58 6a57112
Author: Lorenzo Miniero <lminiero at gmail.com>
Date: Tue Aug 1 16:02:59 2017 +0200
Merge branch 'master' into sipre
html/citeus.html | 29 +++++++++++++++++
html/videoroomtest.js | 10 ++++--
ice.c | 26 +++++----------
janus.c | 57 +++++++++++++++++----------------
janus.h | 4 +--
plugins/janus_echotest.c | 4 +--
plugins/janus_recordplay.c | 2 +-
plugins/janus_sip.c | 11 +++++--
plugins/janus_streaming.c | 66 +++++++++++++++++++++++++++++---------
plugins/janus_videocall.c | 8 ++---
plugins/janus_videoroom.c | 80 +++++++++++++++++++++++++++++++++++-----------
sdp-utils.c | 18 +++++++++++
sdp-utils.h | 8 +++++
utils.c | 6 ++--
14 files changed, 234 insertions(+), 95 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git
More information about the Pkg-voip-commits
mailing list