diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-19 16:46:09 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-19 16:46:09 +0000 |
| commit | bb44768961ea2e834638d20bc33f34449b87d212 (patch) | |
| tree | caf712931f50a931e4914dea581dd2e530e87fc4 /include | |
| parent | 269dc9cee0f20b793ca041a4da217a9048d6f4f7 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@177389 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index d2d7b723d..9540776e5 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 */ |