[asterisk-commits] mmichelson: branch 1.6.0 r172604 - in /branches/1.6.0: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Jan 30 16:23:11 2009
New Revision: 172604

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=172604
Log:
Merged revisions 172598 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r172598 | mmichelson | 2009-01-30 16:22:04 -0600 (Fri, 30 Jan 2009) | 3 lines

Fix redefinition of flag in channel.h


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/channel.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/include/asterisk/channel.h?view=diff&rev=172604&r1=172603&r2=172604
==============================================================================
--- branches/1.6.0/include/asterisk/channel.h (original)
+++ branches/1.6.0/include/asterisk/channel.h Fri Jan 30 16:23:11 2009
@@ -595,7 +595,7 @@
 	/*! This flag indicates that the hangup exten should NOT be run when the 
 	 *  bridge terminates, this will allow the hangup in the pbx loop to be run instead.
 	 *  */
-	AST_FLAG_BRIDGE_HANGUP_DONT = (1 << 17),
+	AST_FLAG_BRIDGE_HANGUP_DONT = (1 << 18),
 };
 
 /*! \brief ast_bridge_config flags */