[asterisk-commits] trunk r34090 - in /trunk: ./ apps/ include/asterisk/

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Wed Jun 14 07:12:57 MST 2006 

Author: kpfleming
Date: Wed Jun 14 09:12:56 2006
New Revision: 34090

URL: http://svn.digium.com/view/asterisk?rev=34090&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/abstract_jb.c
    trunk/apps/app_amd.c
    trunk/apps/app_chanspy.c
    trunk/apps/app_dumpchan.c
    trunk/fixedjitterbuf.c
    trunk/include/asterisk/abstract_jb.h
    trunk/include/asterisk/plc.h
    trunk/include/asterisk/udptl.h
    trunk/jitterbuf.c
    trunk/plc.c
    trunk/udptl.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/abstract_jb.c
URL: http://svn.digium.com/view/asterisk/trunk/abstract_jb.c?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/abstract_jb.c (original)
+++ trunk/abstract_jb.c Wed Jun 14 09:12:56 2006
@@ -5,8 +5,6 @@
  *
  * Contributors:
  * Slav Klenov <slav at securax.org>
- *
- * 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
@@ -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

Modified: trunk/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_amd.c?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/apps/app_amd.c (original)
+++ trunk/apps/app_amd.c Wed Jun 14 09:12:56 2006
@@ -4,8 +4,6 @@
  * Copyright (C) 2003 - 2006, Aheeva Technology.
  *
  * Claude Klimos (claude.klimos at aheeva.com)
- *
- * Disclaimed to Digium
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
@@ -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"

Modified: trunk/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_chanspy.c?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/apps/app_chanspy.c (original)
+++ trunk/apps/app_chanspy.c Wed Jun 14 09:12:56 2006
@@ -4,7 +4,8 @@
  * Copyright (C) 2005 Anthony Minessale II (anthmct at 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

Modified: trunk/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dumpchan.c?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/apps/app_dumpchan.c (original)
+++ trunk/apps/app_dumpchan.c Wed Jun 14 09:12:56 2006
@@ -5,7 +5,8 @@
  *
  * Anthony Minessale <anthmct at 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

Modified: trunk/fixedjitterbuf.c
URL: http://svn.digium.com/view/asterisk/trunk/fixedjitterbuf.c?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/fixedjitterbuf.c (original)
+++ trunk/fixedjitterbuf.c Wed Jun 14 09:12:56 2006
@@ -3,8 +3,6 @@
  *
  * Contributors:
  * Slav Klenov <slav at securax.org>
- *
- * 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
@@ -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 

Modified: trunk/include/asterisk/abstract_jb.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/abstract_jb.h?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/include/asterisk/abstract_jb.h (original)
+++ trunk/include/asterisk/abstract_jb.h Wed Jun 14 09:12:56 2006
@@ -5,8 +5,6 @@
  *
  * Contributors:
  * Slav Klenov <slav at securax.org>
- *
- * 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
@@ -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

Modified: trunk/include/asterisk/plc.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/plc.h?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/include/asterisk/plc.h (original)
+++ trunk/include/asterisk/plc.h Wed Jun 14 09:12:56 2006
@@ -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.
  */
 
 

Modified: trunk/include/asterisk/udptl.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/udptl.h?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/include/asterisk/udptl.h (original)
+++ trunk/include/asterisk/udptl.h Wed Jun 14 09:12:56 2006
@@ -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

Modified: trunk/jitterbuf.c
URL: http://svn.digium.com/view/asterisk/trunk/jitterbuf.c?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/jitterbuf.c (original)
+++ trunk/jitterbuf.c Wed Jun 14 09:12:56 2006
@@ -6,7 +6,8 @@
  * Contributors:
  * Steve Kann <stevek at 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

Modified: trunk/plc.c
URL: http://svn.digium.com/view/asterisk/trunk/plc.c?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/plc.c (original)
+++ trunk/plc.c Wed Jun 14 09:12:56 2006
@@ -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

Modified: trunk/udptl.c
URL: http://svn.digium.com/view/asterisk/trunk/udptl.c?rev=34090&r1=34089&r2=34090&view=diff
==============================================================================
--- trunk/udptl.c (original)
+++ trunk/udptl.c Wed Jun 14 09:12:56 2006
@@ -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"

More information about the asterisk-commits mailing list