=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/join/join.c,v retrieving revision 1.14 retrieving revision 1.15 diff -c -r1.14 -r1.15 *** src/usr.bin/join/join.c 2002/02/16 21:27:47 1.14 --- src/usr.bin/join/join.c 2003/06/03 02:56:09 1.15 *************** *** 1,4 **** ! /* $OpenBSD: join.c,v 1.14 2002/02/16 21:27:47 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 --- 1,4 ---- ! /* $OpenBSD: join.c,v 1.15 2003/06/03 02:56:09 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 *************** *** 16,26 **** * 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 * may be used to endorse or promote products derived from this software * without specific prior written permission. * --- 16,22 ---- * 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. 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. * *************** *** 45,51 **** #ifndef lint /*static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95"; */ ! static char rcsid[] = "$OpenBSD: join.c,v 1.14 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ #include --- 41,47 ---- #ifndef lint /*static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95"; */ ! static char rcsid[] = "$OpenBSD: join.c,v 1.15 2003/06/03 02:56:09 millert Exp $"; #endif /* not lint */ #include