Merged revisions 293530 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Mon, 1 Nov 2010 17:32:16 +0000 (17:32 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 1 Nov 2010 17:32:16 +0000 (17:32 +0000)
commit10cbc4a1328af113d708d47596c79062357ff45b
treed33e9f1335edb684946c74f2fa5dde7a0b72ba80
parent53149a69dfeb09a86576ab705fa50ecb3feb0f40
Merged revisions 293530 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293530 | rmudgett | 2010-11-01 12:29:30 -0500 (Mon, 01 Nov 2010) | 10 lines

  Analog 3-way call would not connect all parties if one was using sig_pri.

  Also the "dahdi show channel" would not show the correct 3-way call
  status.

  * Synchronized the inthreeway flag between chan_dahdi and sig_analog.

  * Fixed a my_set_linear_mode() sign error and made take an analog sub
  channel enum.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293531 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_dahdi.c
channels/sig_analog.c
channels/sig_analog.h