aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-14 15:06:38 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-14 15:06:38 +0000
commitdc25b6fd37bd40faa8eaf78ec8767ef66761dcec (patch)
tree902bb4db2a9779d35a66c5039dfc98f6013864c2
parentffbf8d72d378fde84faa8e81650c5a6e262d5c42 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@34125 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_chanspy.c3
-rw-r--r--apps/app_dumpchan.c3
-rw-r--r--include/asterisk/plc.h4
-rw-r--r--jitterbuf.c3
-rw-r--r--plc.c3
5 files changed, 11 insertions, 5 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 299c58efc..1c8851750 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 4802dfee1..6e882e0e2 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 a790ca167..54090e4fe 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 2fb349764..c952b9c62 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 f0ad46eeb..f543551f3 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