From b29e724a4309feb36c3bdae8517779f10f388a17 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Wed, 14 Jun 2006 14:12:56 +0000 Subject: Merged revisions 34087 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r34087 | kpfleming | 2006-06-14 09:07:53 -0500 (Wed, 14 Jun 2006) | 2 lines clarify file headers that mention disclaimer usage ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@34090 f38db490-d61c-443f-a65b-d21fe96a405b --- abstract_jb.c | 5 +++-- apps/app_amd.c | 5 +++-- apps/app_chanspy.c | 3 ++- apps/app_dumpchan.c | 3 ++- fixedjitterbuf.c | 5 +++-- include/asterisk/abstract_jb.h | 5 +++-- include/asterisk/plc.h | 4 +++- include/asterisk/udptl.h | 3 ++- jitterbuf.c | 3 ++- plc.c | 3 ++- udptl.c | 3 ++- 11 files changed, 27 insertions(+), 15 deletions(-) diff --git a/abstract_jb.c b/abstract_jb.c index d9b4dc965..1525d81b0 100644 --- a/abstract_jb.c +++ b/abstract_jb.c @@ -6,8 +6,6 @@ * Contributors: * Slav Klenov * - * Copyright on this file is disclaimed to Digium for inclusion in Asterisk - * * See http://www.asterisk.org for more information about * the Asterisk project. Please do not directly contact * any of the maintainers of this project for assistance; @@ -17,6 +15,9 @@ * This program is free software, distributed under the terms of * the GNU General Public License Version 2. See the LICENSE file * at the top of the source tree. + * + * A license has been granted to Digium (via disclaimer) for the use of + * this code. */ /*! \file diff --git a/apps/app_amd.c b/apps/app_amd.c index 245f842c0..b5acb9682 100644 --- a/apps/app_amd.c +++ b/apps/app_amd.c @@ -5,8 +5,6 @@ * * Claude Klimos (claude.klimos@aheeva.com) * - * Disclaimed to Digium - * * See http://www.asterisk.org for more information about * the Asterisk project. Please do not directly contact * any of the maintainers of this project for assistance; @@ -16,6 +14,9 @@ * This program is free software, distributed under the terms of * the GNU General Public License Version 2. See the LICENSE file * at the top of the source tree. + * + * A license has been granted to Digium (via disclaimer) for the use of + * this code. */ #include "asterisk.h" diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 5494b89b9..9137c7e0b 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -4,7 +4,8 @@ * Copyright (C) 2005 Anthony Minessale II (anthmct@yahoo.com) * Copyright (C) 2005 - 2006, Digium, Inc. * - * 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 2ee698c40..4ba386752 100644 --- a/apps/app_dumpchan.c +++ b/apps/app_dumpchan.c @@ -5,7 +5,8 @@ * * Anthony Minessale * - * 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/fixedjitterbuf.c b/fixedjitterbuf.c index d2f4a95dc..1d7a5cc30 100644 --- a/fixedjitterbuf.c +++ b/fixedjitterbuf.c @@ -4,8 +4,6 @@ * Contributors: * Slav Klenov * - * Copyright on this file is disclaimed to Digium for inclusion in Asterisk - * * See http://www.asterisk.org for more information about * the Asterisk project. Please do not directly contact * any of the maintainers of this project for assistance; @@ -15,6 +13,9 @@ * This program is free software, distributed under the terms of * the GNU General Public License Version 2. See the LICENSE file * at the top of the source tree. + * + * A license has been granted to Digium (via disclaimer) for the use of + * this code. */ /*! \file diff --git a/include/asterisk/abstract_jb.h b/include/asterisk/abstract_jb.h index 622f49b46..014902be8 100644 --- a/include/asterisk/abstract_jb.h +++ b/include/asterisk/abstract_jb.h @@ -6,8 +6,6 @@ * Contributors: * Slav Klenov * - * Copyright on this file is disclaimed to Digium for inclusion in Asterisk - * * See http://www.asterisk.org for more information about * the Asterisk project. Please do not directly contact * any of the maintainers of this project for assistance; @@ -17,6 +15,9 @@ * This program is free software, distributed under the terms of * the GNU General Public License Version 2. See the LICENSE file * at the top of the source tree. + * + * A license has been granted to Digium (via disclaimer) for the use of + * this code. */ /*! \file diff --git a/include/asterisk/plc.h b/include/asterisk/plc.h index 22eb738ac..762504952 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/include/asterisk/udptl.h b/include/asterisk/udptl.h index 5b8098078..1615a19ef 100644 --- a/include/asterisk/udptl.h +++ b/include/asterisk/udptl.h @@ -11,7 +11,8 @@ * This program is free software, distributed under the terms of * the GNU General Public License * - * 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. */ #ifndef _ASTERISK_UDPTL_H diff --git a/jitterbuf.c b/jitterbuf.c index f7d1a31ed..a541d67e5 100644 --- a/jitterbuf.c +++ b/jitterbuf.c @@ -6,7 +6,8 @@ * Contributors: * Steve Kann * - * 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 4c388907e..143c8adea 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 diff --git a/udptl.c b/udptl.c index e83c61997..a7c6e8a45 100644 --- a/udptl.c +++ b/udptl.c @@ -11,7 +11,8 @@ * This program is free software, distributed under the terms of * the GNU General Public License * - * 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. */ #include "asterisk.h" -- cgit v1.2.3