summaryrefslogtreecommitdiff
path: root/channels/chan_oss.c
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2011-05-06 08:21:22 +0000
committerTerry Wilson <twilson@digium.com>2011-05-06 08:21:22 +0000
commit892953466b3fcaaca4fb7b523c9f14274715976c (patch)
tree095909b408a2ab831137e8b796a055c967937c9c /channels/chan_oss.c
parentb802909d071680f00391a4066fbbd02175aed153 (diff)
Merged revisions 317584 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r317584 | twilson | 2011-05-06 01:18:53 -0700 (Fri, 06 May 2011) | 20 lines Merged revisions 317575 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r317575 | twilson | 2011-05-06 01:04:17 -0700 (Fri, 06 May 2011) | 13 lines Merged revisions 317574 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r317574 | twilson | 2011-05-06 00:55:21 -0700 (Fri, 06 May 2011) | 6 lines Re-fix queue round-robin This part of the change for r315596 was incorrect. No bridge occurs when doing a roundrobin dial and no one answers, so this code shouldn't have been removed. ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_oss.c')
0 files changed, 0 insertions, 0 deletions