From: Kevin P. Fleming <kpfleming@digium.com>
Date: Fri, 11 Nov 2005 18:03:31 +0000 (+0000)
Subject: update for mark's commit
X-Git-Tag: 1.2.0-rc2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=500dd158fe0e667864228411dfe9f98213e676b1;p=thirdparty%2Fasterisk.git

update for mark's commit


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

diff --git a/ChangeLog b/ChangeLog
index 190545f996..3e4509b9ab 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2005-11-11  Kevin P. Fleming  <kpfleming@digium.com>
+2005-11-11  Mark Spencer <markster@digium.com>
+
+	* channels/chan_zap.c (zt_bridge): only enable/disable DTMF detection on SUB_REAL channels
+
+2005-11-10  Kevin P. Fleming  <kpfleming@digium.com>
 
 	* channels/chan_iax2.c: ensure that system headers that provide basic types are included first (issue #5713)