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 299c58efc559e17e89e276689547225b141735ce..1c8851750dcfa77faa22a8fa29ebe09e8b654d64 100644 (file)
--- 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 4802dfee1626e50204305272a73ff129385a21c1..6e882e0e2cd1793753917762037b815a59a6821c 100644 (file)
--- 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 a790ca167fa1ba9c18b0d2c141b50d6f84316429..54090e4fefddd999b97dd3a0243a657b02bf93b8 100644 (file)
--- 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 2fb349764e02c76289b634dfa541a16acc8fa842..c952b9c62aed0d0ae00215cc633b6b4f8028f285 100644 (file)
--- 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 f0ad46eeb7b0f0f595d753591ed5c312e1d1b040..f543551f3251e71abffca1265af65b6bb7013bd2 100644 (file)
--- 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