summaryrefslogtreecommitdiff
path: root/main/channel.c
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2010-12-07 22:54:00 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2010-12-07 22:54:00 +0000
commit5656e5020fcf11ebf7df5636a7e9bce8036eabcb (patch)
treeba2263be8256b93cb6e760ea2bc5a22fd5e151f6 /main/channel.c
parent997816819bb66dcab31660b850781be72b984333 (diff)
Merged revisions 297821 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r297821 | tilghman | 2010-12-07 16:51:05 -0600 (Tue, 07 Dec 2010) | 18 lines Merged revisions 297819 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r297819 | tilghman | 2010-12-07 16:40:45 -0600 (Tue, 07 Dec 2010) | 11 lines Merged revisions 297818 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r297818 | tilghman | 2010-12-07 16:35:50 -0600 (Tue, 07 Dec 2010) | 4 lines Use non-deprecated APIs for CoreAudio Review: https://reviewboard.asterisk.org/r/1040/ ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@297822 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/channel.c')
0 files changed, 0 insertions, 0 deletions