summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2011-09-15 12:50:40 +0000
committerOlle Johansson <oej@edvina.net>2011-09-15 12:50:40 +0000
commit73424f128e6eaec939072ef3c85f4d97706e7500 (patch)
tree5c2980b420be8f0e555608322f38e2d5d8f48c7b /CREDITS
parent40b76b6893307019888d492489a4d1dde801ad20 (diff)
Merged revisions 336042 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r336042 | oej | 2011-09-15 14:46:38 +0200 (Tor, 15 Sep 2011) | 12 lines Meetme: Introducing a new option "k" to kill a conference if there's only a single member left. When using Meetme as a modular call bridge from third party applications, it's handy to make it behave like a normal call bridge. When the second to last person exists, the last person will be kicked out of the conference when this option is enabled. (closes issue ASTERISK-18234) Review: https://reviewboard.asterisk.org/r/1376/ Patch by oej, sponsored by ClearIT, Solna, Sweden ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336043 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index a84282157..b93044d0d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -23,7 +23,7 @@ John Todd, TalkPlus, Inc. and JR Richardson, Ntegrated Solutions. - for funding
Omnitor AB, Gunnar Hellström, for funding work with videocaps, T.140 RED,
originate with video/text and many more contributions.
-ClearIT AB for work with RTCP, manager and tonezones
+ClearIT AB for work with meetme, res_mutestream, RTCP, manager and tonezones
=== WISHLIST CONTRIBUTERS ===
Jeremy McNamara - SpeeX support