From: Jeff Peeler Date: Thu, 19 Feb 2009 16:46:09 +0000 (+0000) Subject: Merged revisions 177387 via svnmerge from X-Git-Tag: 1.6.1.0-rc2~81 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=461e660582a4770cdadce8eb2b4e67d77aeadae3;p=thirdparty%2Fasterisk.git 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@177389 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index d2d7b723d5..9540776e5a 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -572,7 +572,7 @@ enum { 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 */