[Pkg-voip-commits] [janus] 141/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 cdb96cce07a67361a9ed1a164655c0139de72357
Merge: 3b77505 de7829f
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon Oct 23 12:39:41 2017 +0200

    Merge branch 'master' into nosip

 Makefile.am                            |  41 +++++++++++++
 conf/janus.plugin.videoroom.cfg.sample |   5 ++
 configure.ac                           |  81 ++++++++++++++++++++++++++
 docs/doxy-boot.js                      |   2 +
 html/janus.js                          |  18 +++---
 mainpage.dox                           | 101 ++++++++++++++++++++++++++++++---
 npm/.gitignore                         |   3 +
 npm/module.js                          |   8 +++
 npm/package.json                       |  14 +++++
 npm/rollup.config.js                   |  17 ++++++
 plugins/janus_videoroom.c              |  42 +++++++++++++-
 plugins/plugin.c                       |   4 +-
 plugins/plugin.h                       |  53 ++++++++---------
 postprocessing/pp-g722.c               |   8 +++
 14 files changed, 353 insertions(+), 44 deletions(-)


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