--------------------- PatchSet 10522 Date: 2008/04/27 20:46:38 Author: serassio Branch: nt Tag: (none) Log: Remove the advertisement clause from BSD license, superseeded in the new revised BSD license Members: CREDITS:1.5.26.4->1.5.26.5 lib/getopt.c:1.1.124.4->1.1.124.5 port/win32/include/getopt.h:1.1.38.3->1.1.38.4 Index: squid/CREDITS =================================================================== RCS file: /cvsroot/squid-sf//squid/CREDITS,v retrieving revision 1.5.26.4 retrieving revision 1.5.26.5 diff -u -r1.5.26.4 -r1.5.26.5 --- squid/CREDITS 27 Apr 2008 09:33:03 -0000 1.5.26.4 +++ squid/CREDITS 27 Apr 2008 20:46:38 -0000 1.5.26.5 @@ -1,4 +1,4 @@ -$Id: CREDITS,v 1.5.26.4 2008/04/27 09:33:03 serassio Exp $ +$Id: CREDITS,v 1.5.26.5 2008/04/27 20:46:38 serassio Exp $ ============================================================================== @@ -316,11 +316,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Index: squid/lib/getopt.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/Attic/getopt.c,v retrieving revision 1.1.124.4 retrieving revision 1.1.124.5 diff -u -r1.1.124.4 -r1.1.124.5 --- squid/lib/getopt.c 27 Apr 2008 09:36:45 -0000 1.1.124.4 +++ squid/lib/getopt.c 27 Apr 2008 20:46:38 -0000 1.1.124.5 @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Index: squid/port/win32/include/getopt.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/getopt.h,v retrieving revision 1.1.38.3 retrieving revision 1.1.38.4 diff -u -r1.1.38.3 -r1.1.38.4 --- squid/port/win32/include/getopt.h 27 Apr 2008 09:36:45 -0000 1.1.38.3 +++ squid/port/win32/include/getopt.h 27 Apr 2008 20:46:39 -0000 1.1.38.4 @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. *