From: Automerge script <automerge@asterisk.org>
Date: Wed, 14 Jun 2006 15:06:38 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.10-netsec~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05c3bd0de5b4278d2fde2e28a4b6880f7d3dce5b;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 299c58efc5..1c8851750d 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -3,7 +3,8 @@
  *
  * Copyright (C) 2005 Anthony Minessale II (anthmct@yahoo.com)
  *
- * Disclaimed to Digium
+ * A license has been granted to Digium (via disclaimer) for the use of
+ * this code.
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index 4802dfee16..6e882e0e2c 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -5,7 +5,8 @@
  *
  * Anthony Minessale <anthmct@yahoo.com>
  *
- * disclaimed to Digium
+ * A license has been granted to Digium (via disclaimer) for the use of
+ * this code.
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
diff --git a/include/asterisk/plc.h b/include/asterisk/plc.h
index a790ca167f..54090e4fef 100644
--- a/include/asterisk/plc.h
+++ b/include/asterisk/plc.h
@@ -24,7 +24,9 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * This version may be optionally licenced under the GNU LGPL licence.
- * This version is disclaimed to DIGIUM for inclusion in the Asterisk project.
+ *
+ * A license has been granted to Digium (via disclaimer) for the use of
+ * this code.
  */
 
 
diff --git a/jitterbuf.c b/jitterbuf.c
index 2fb349764e..c952b9c62a 100644
--- a/jitterbuf.c
+++ b/jitterbuf.c
@@ -6,7 +6,8 @@
  * Contributors:
  * Steve Kann <stevek@stevek.com>
  *
- * Copyright on this file is disclaimed to Digium for inclusion in Asterisk
+ * A license has been granted to Digium (via disclaimer) for the use of
+ * this code.
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
diff --git a/plc.c b/plc.c
index f0ad46eeb7..f543551f32 100644
--- a/plc.c
+++ b/plc.c
@@ -19,7 +19,8 @@
  *
  * This version may be optionally licenced under the GNU LGPL licence.
  *
- * This version is disclaimed to DIGIUM for inclusion in the Asterisk project.
+ * A license has been granted to Digium (via disclaimer) for the use of
+ * this code.
  */
 
 /*! \file