From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 14 Aug 2009 22:40:01 +0000 (+0000)
Subject: Blocked revisions 212287 via svnmerge
X-Git-Tag: 1.6.1.7-rc1~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbef2f96fd2d9b2e31d5ac70df24ec20990105be;p=thirdparty%2Fasterisk.git

Blocked revisions 212287 via svnmerge

........
  r212287 | jpeeler | 2009-08-14 17:39:11 -0500 (Fri, 14 Aug 2009) | 9 lines

  More code that somehow got left out of sig_analog

  * confirmanswer option now respected
  * check and set waiting for dialtone timer
  * unneeded needcallerid flag removed from analog_subchannel
  * ss_astchan does not need to be a void pointer
  * swap_channels callback updated to trunk
  * analog_hangup now resets channel to default law
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@212289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---