diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-21 16:55:11 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-21 16:55:11 +0000 |
| commit | f4821aa327cfdc51abcfb04deb19cec291faecfa (patch) | |
| tree | 4b75dac9ff2c340082ff9408ee16ed2480fc76f8 /include | |
| parent | 9057edbafdef5e023f173cc1e4ce63c764a46b0b (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@265001 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 821ed09b0..f50229969 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. |