[Pkg-voip-commits] [janus] 65/282: Merge branch 'master' into nosip
Jonas Smedegaard
dr at jones.dk
Wed Dec 20 21:53:28 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 91aa740534967693b234afda2500892399e1d40e
Merge: 14d31fc 58520fb
Author: Lorenzo Miniero <lminiero at gmail.com>
Date: Thu Jun 8 12:43:19 2017 +0200
Merge branch 'master' into nosip
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
More information about the Pkg-voip-commits
mailing list