diff options
| author | Mark Spencer <markster@digium.com> | 2004-07-28 19:25:14 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-07-28 19:25:14 +0000 |
| commit | bf70a01da6d1839d65547f942e116f889ef97aa7 (patch) | |
| tree | 89eeba2a0791bb7c64d996fc4664e7c689dc7465 /apps/app_meetme.c | |
| parent | 5733f64bdd05ca24c52b6d1710795488b0cdb50c (diff) | |
Merge alternate hangup and meetme patches from Matt N.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rwxr-xr-x | apps/app_meetme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 2070490f1..fd40932e3 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -66,8 +66,8 @@ static char *descrip = " 'v' -- video mode\n" " 'q' -- quiet mode (don't play enter/leave sounds)\n" " 'M' -- enable music on hold when the conference has a single caller\n" -" 'x' -- exit the conference if the last marked user left\n" -" 'w' -- wait until a marked user has entered the conference\n" +" 'x' -- close the conference when last user marked with 'x' exits\n" +" 'w' -- wait until a user marked with the 'x' option enters the conference\n" " 'b' -- run AGI script specified in ${MEETME_AGI_BACKGROUND}\n" " Default: conf-background.agi\n" " (Note: This does not work with non-Zap channels in the same conference)\n" |