From: Mark Michelson Date: Fri, 21 May 2010 16:55:11 +0000 (+0000) Subject: Merged revisions 265000 via svnmerge from X-Git-Tag: 1.6.2.9-rc1~2^2~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f83214b6122e8c758d54731edc3f7ed04aa2f078;p=thirdparty%2Fasterisk.git Merged revisions 265000 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r265000 | mmichelson | 2010-05-21 11:54:21 -0500 (Fri, 21 May 2010) | 9 lines Merged revisions 264999 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r264999 | mmichelson | 2010-05-21 11:53:53 -0500 (Fri, 21 May 2010) | 3 lines Fix grammatical error in comment. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@265001 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 821ed09b0c..f50229969f 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1140,7 +1140,7 @@ int ast_waitfor(struct ast_channel *chan, int ms); * * There are functions such as ast_safe_sleep which will * service a channel to ensure that it does not have a - * have a large backlog of queued frames. When this happens, + * large backlog of queued frames. When this happens, * we want to hold on to specific frame types and just drop * others. This function will tell if the frame we just * read should be held onto.