From 94b5353c71e7246077d468afe68d51ce85fc213d Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Thu, 23 Mar 1995 08:28:00 +0000
Subject: merge with Lite, new RCS id conventions, etc.

---
 fish/fish.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'fish/fish.c')

diff --git a/fish/fish.c b/fish/fish.c
index 9eb93031..14af9c05 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: fish.c,v 1.3 1995/03/23 08:28:18 cgd Exp $	*/
+
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Muffy Barkocy.
@@ -35,14 +37,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1990, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)fish.c	5.4 (Berkeley) 1/18/91";*/
-static char rcsid[] = "$Id: fish.c,v 1.2 1993/08/01 18:54:54 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)fish.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: fish.c,v 1.3 1995/03/23 08:28:18 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/types.h>
-- 
cgit v1.2.3