kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-11 12:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 177356 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177356 | jpeeler | 2009-02-19 09:56:31 -0600 (Thu, 19 Feb 2009) | 4 lines
  
  Fix mismerge from revision 176708 pointed out by Kaloyan Kovachev on the
  asterisk-dev mailing list. Thanks!
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@177358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-02-19 15:57:44 +00:00
parent f72d04de72
commit 1a446ca100
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/features.c
View File

@@ -2473,7 +2473,6 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
config->feature_timer -= diff; config->feature_timer -= diff;
} }
config->feature_timer -= diff;
if (hasfeatures) { if (hasfeatures) {
/* Running on backup config, meaning a feature might be being /* Running on backup config, meaning a feature might be being
activated, but that's no excuse to keep things going activated, but that's no excuse to keep things going