From: Automerge script <automerge@asterisk.org>
Date: Sun, 12 Mar 2006 19:05:14 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.6-netsec~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e3f10b86f95742025caa1cabc3da4ec19ec0d40;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/channels/misdn/mISDN.patch b/channels/misdn/mISDN.patch
index 681c5fa79a..ccc8ae4b2c 100644
--- a/channels/misdn/mISDN.patch
+++ b/channels/misdn/mISDN.patch
@@ -430,7 +430,7 @@ diff -u -r -P /tmp/mISDN/drivers/isdn/hardware/mISDN/dsp_cancel.c mISDN/drivers/
 --- /tmp/mISDN/drivers/isdn/hardware/mISDN/dsp_cancel.c	1970-01-01 01:00:00.000000000 +0100
 +++ mISDN/drivers/isdn/hardware/mISDN/dsp_cancel.c	2005-12-02 09:57:08.000000000 +0100
 @@ -0,0 +1,390 @@
-+/* $Id: mISDN_echo_cancel.patch,v 1.1 2005/11/07 16:01:31 nadi Exp $
++/* $Id$
 + *
 + * Simple but fast Echo cancellation for mISDN_dsp.
 + *