aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk/channel.h
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-07-28 19:25:14 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-07-28 19:25:14 +0000
commit92633d15d84b068cf195d817838740a035bfa840 (patch)
tree89eeba2a0791bb7c64d996fc4664e7c689dc7465 /include/asterisk/channel.h
parentf51192d72b9e6bc784d9a9566f5e359702385330 (diff)
Merge alternate hangup and meetme patches from Matt N.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3529 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/channel.h')
-rwxr-xr-xinclude/asterisk/channel.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index e4421c1b1..cf86318ce 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -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;