Update of /cvsroot/pure-data/externals/OSCx/libOSC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32326/libOSC

Modified Files: OSC-client.c OSC-client.h OSC-timetag.c OSC-timetag.h Removed Files: OSC-client.c.pre-htonl Log Message: changed offending cnmat licences to current one

Index: OSC-timetag.h =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/OSC-timetag.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSC-timetag.h 7 Apr 2004 04:15:04 -0000 1.2 --- OSC-timetag.h 19 Aug 2004 22:01:37 -0000 1.3 *************** *** 1,8 **** /* - Copyright © 1998. The Regents of the University of California (Regents). - All Rights Reserved. - Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley.

Permission to use, copy, modify, distribute, and distribute modified versions --- 1,6 ---- /* Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1998,99,2000,01,02,03,04 ! The Regents of the University of California (Regents).

Permission to use, copy, modify, distribute, and distribute modified versions *************** *** 27,31 **** */

- /* OSC_timeTag.h: library for manipulating OSC time tags --- 25,28 ----

Index: OSC-client.h =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/OSC-client.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** OSC-client.h 6 Aug 2002 12:13:57 -0000 1.1.1.1 --- OSC-client.h 19 Aug 2004 22:01:37 -0000 1.2 *************** *** 1,28 **** /* - Copyright (c) 1996,1997. The Regents of the University of California (Regents). - All Rights Reserved. - - Permission to use, copy, modify, and distribute this software and its - documentation for educational, research, and not-for-profit purposes, without - fee and without a signed licensing agreement, is hereby granted, provided that - the above copyright notice, this paragraph and the following two paragraphs - appear in all copies, modifications, and distributions. Contact The Office of - Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, - CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. - Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley.

! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */

--- 1,23 ---- /* Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1996,97,98,99,2000,01,02,03 ! The Regents of the University of California (Regents).

! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions.

! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */

Index: OSC-client.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/OSC-client.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OSC-client.c 4 Apr 2004 22:10:41 -0000 1.4 --- OSC-client.c 19 Aug 2004 22:01:27 -0000 1.5 *************** *** 1,28 **** /* - Copyright (c) 1996. The Regents of the University of California (Regents). - All Rights Reserved. - - Permission to use, copy, modify, and distribute this software and its - documentation for educational, research, and not-for-profit purposes, without - fee and without a signed licensing agreement, is hereby granted, provided that - the above copyright notice, this paragraph and the following two paragraphs - appear in all copies, modifications, and distributions. Contact The Office of - Technology Licensing, UC Berkeley, 2150 Shattuck Avenue, Suite 510, Berkeley, - CA 94720-1620, (510) 643-7201, for commercial licensing opportunities. - Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley.

! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ! ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ! REGENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ! FOR A PARTICULAR PURPOSE. THE SOFTWARE AND ACCOMPANYING ! DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS IS". ! REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ! ENHANCEMENTS, OR MODIFICATIONS. */

--- 1,23 ---- /* Written by Matt Wright, The Center for New Music and Audio Technologies, ! University of California, Berkeley. Copyright (c) 1996,97,98,99,2000,01,02,03 ! The Regents of the University of California (Regents).

! Permission to use, copy, modify, distribute, and distribute modified versions ! of this software and its documentation without fee and without a signed ! licensing agreement, is hereby granted, provided that the above copyright ! notice, this paragraph and the following two paragraphs appear in all copies, ! modifications, and distributions.

! IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, ! SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING ! OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF REGENTS HAS ! BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ! THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE. THE SOFTWARE AND ACCOMPANYING DOCUMENTATION, IF ANY, PROVIDED ! HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE ! MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */

*************** *** 41,44 **** --- 36,42 ---- rev. for Win32 build (verified under Win-2ooo) 11-April-2002

+ -- changed licence part (20040820) jdl + -- Version 2.4 changes not in here (20040820) jdl + */

Index: OSC-timetag.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/libOSC/OSC-timetag.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OSC-timetag.c 7 Apr 2004 04:15:04 -0000 1.2 --- OSC-timetag.c 19 Aug 2004 22:01:37 -0000 1.3 *************** *** 1,7 **** /* ! Copyright © 1998. The Regents of the University of California (Regents). ! All Rights Reserved. ! ! Written by Matt Wright, The Center for New Music and Audio Technologies, University of California, Berkeley.

--- 1,5 ---- /* ! Copyright (c) 1998,99,2000,01,02,03. The Regents of the University of California (Regents). ! All Rights Reserved. Written by Matt Wright, Center for New Music and Audio Technologies, University of California, Berkeley.

*************** *** 27,31 **** */

- /*

--- 25,28 ----

--- OSC-client.c.pre-htonl DELETED ---