From 94b5353c71e7246077d468afe68d51ce85fc213d Mon Sep 17 00:00:00 2001 From: cgd Date: Thu, 23 Mar 1995 08:28:00 +0000 Subject: merge with Lite, new RCS id conventions, etc. --- fortune/unstr/Makefile | 4 ++-- fortune/unstr/unstr.c | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'fortune/unstr') diff --git a/fortune/unstr/Makefile b/fortune/unstr/Makefile index c884c67d..2619580a 100644 --- a/fortune/unstr/Makefile +++ b/fortune/unstr/Makefile @@ -1,5 +1,5 @@ -# from: @(#)Makefile 5.1 (Berkeley) 4/27/91 -# $Id: Makefile,v 1.2 1993/08/01 05:45:17 mycroft Exp $ +# $NetBSD: Makefile,v 1.3 1995/03/23 08:28:58 cgd Exp $ +# @(#)Makefile 8.1 (Berkeley) 5/31/93 PROG= unstr NOMAN= noman diff --git a/fortune/unstr/unstr.c b/fortune/unstr/unstr.c index 59bd4b68..5ea33d26 100644 --- a/fortune/unstr/unstr.c +++ b/fortune/unstr/unstr.c @@ -1,6 +1,8 @@ +/* $NetBSD: unstr.c,v 1.3 1995/03/23 08:29:00 cgd Exp $ */ + /*- - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1991, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Ken Arnold. @@ -35,14 +37,13 @@ */ #ifndef lint -char copyright[] = -"@(#) Copyright (c) 1991 The Regents of the University of California.\n\ - All rights reserved.\n"; +static char copyright[] = +"@(#) Copyright (c) 1991, 1993\n\ + The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -/*static char sccsid[] = "from: @(#)unstr.c 5.8 (Berkeley) 4/8/91";*/ -static char rcsid[] = "$Id: unstr.c,v 1.2 1993/08/01 18:54:39 mycroft Exp $"; +static char sccsid[] = "@(#)unstr.c 8.1 (Berkeley) 5/31/93"; #endif /* not lint */ /* -- cgit v1.2.3