Merge fabeman's extensive meetme improvements (bug #1624)
authorMark Spencer <markster@digium.com>
Sat, 22 May 2004 04:11:22 +0000 (04:11 +0000)
committerMark Spencer <markster@digium.com>
Sat, 22 May 2004 04:11:22 +0000 (04:11 +0000)
commita0486afb833b715fad3b31833bd7d2348f5fe6e1
tree900c6863b338822feeda356de1551c36873d6356
parentad67680ed33768eb71b731a14caff1794a706af7
Merge fabeman's extensive meetme improvements (bug #1624)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3038 65c4cc65-6c06-0410-ace0-fbb531ad65f3
14 files changed:
apps/app_meetme.c
channel.c
include/asterisk/channel.h
manager.c
sounds.txt
sounds/conf-adminmenu.gsm [new file with mode: 0755]
sounds/conf-errormenu.gsm [new file with mode: 0755]
sounds/conf-kicked.gsm [new file with mode: 0755]
sounds/conf-locked.gsm [new file with mode: 0755]
sounds/conf-lockednow.gsm [new file with mode: 0755]
sounds/conf-muted.gsm [new file with mode: 0755]
sounds/conf-unlockednow.gsm [new file with mode: 0755]
sounds/conf-unmuted.gsm [new file with mode: 0755]
sounds/conf-usermenu.gsm [new file with mode: 0755]