[asterisk-commits] jpeeler: branch 1.6.1 r177389 - in /branches/1.6.1: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Feb 19 10:46:09 2009
New Revision: 177389

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

........
  r177387 | jpeeler | 2009-02-19 10:45:02 -0600 (Thu, 19 Feb 2009) | 3 lines
  
  Fix another merge error from 176708
........

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

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

Modified: branches/1.6.1/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/include/asterisk/channel.h?view=diff&rev=177389&r1=177388&r2=177389
==============================================================================
--- branches/1.6.1/include/asterisk/channel.h (original)
+++ branches/1.6.1/include/asterisk/channel.h Thu Feb 19 10:46:09 2009
@@ -572,7 +572,7 @@
 	AST_FEATURE_PARKCALL =     (1 << 5),
 	AST_FEATURE_AUTOMIXMON =   (1 << 6),
 	AST_FEATURE_NO_H_EXTEN =   (1 << 7),
-	AST_FEATURE_WARNING_ACTIVE = (1 << 7),
+	AST_FEATURE_WARNING_ACTIVE = (1 << 8),
 };
 
 /*! \brief bridge configuration */