[Asterisk-cvs] asterisk/include/asterisk channel.h,1.49,1.50

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory localhost.localdomain:/tmp/cvs-serv19862/include/asterisk

Modified Files:
	channel.h 
Log Message:
Merge alternate hangup and meetme patches from Matt N.


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- channel.h	22 Jun 2004 18:49:00 -0000	1.49
+++ channel.h	28 Jul 2004 19:25:14 -0000	1.50
@@ -271,7 +271,8 @@
 	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;