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. --- fish/pathnames.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'fish/pathnames.h') diff --git a/fish/pathnames.h b/fish/pathnames.h index 3cd156c8..aa257ff8 100644 --- a/fish/pathnames.h +++ b/fish/pathnames.h @@ -1,6 +1,8 @@ +/* $NetBSD: pathnames.h,v 1.3 1995/03/23 08:28:21 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. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,8 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)pathnames.h 5.1 (Berkeley) 1/18/91 - * $Id: pathnames.h,v 1.2 1993/08/01 18:54:53 mycroft Exp $ + * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 */ #define _PATH_INSTR "/usr/share/games/fish.instr" -- cgit v1.2.3