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 681c5fa79ae1f1691e8c0b9e316ae92302d1c1eb..ccc8ae4b2cba2fee5514275a79c201d4a81db264 100644 (file)
--- 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.
 + *