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
This commit is contained in:
Mark Spencer
2004-07-28 19:25:14 +00:00
parent 5733f64bdd
commit bf70a01da6
5 changed files with 53 additions and 31 deletions

View File

@@ -271,7 +271,8 @@ struct ast_bridge_config {
int play_to_callee;
int allowredirect_in;
int allowredirect_out;
int allowdisconnect;
int allowdisconnect_in;
int allowdisconnect_out;
long timelimit;
long play_warning;
long warning_freq;