Merged revisions 38686 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Tue, 1 Aug 2006 23:09:28 +0000 (23:09 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Tue, 1 Aug 2006 23:09:28 +0000 (23:09 +0000)
commit652d06f998bc5aec995ccbf92d86e474a3bf3028
tree4c2173c4fa266238fccf0cd11a96c5bd9574b52e
parentbec319415f803690b2debf37c28261d5f0186f1f
Merged revisions 38686 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r38686 | kpfleming | 2006-08-01 18:07:06 -0500 (Tue, 01 Aug 2006) | 2 lines

ensure that the 'feature digit timeout' value is taken into account when deciding how long the bridge should run (this fixes a problem report where a digit press that did not invoke a feature is never passed across the bridge)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38687 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channel.c
res/res_features.c