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.

---
 morse/Makefile |  4 ++--
 morse/morse.c  | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'morse')

diff --git a/morse/Makefile b/morse/Makefile
index a189d968..0f28e4f8 100644
--- a/morse/Makefile
+++ b/morse/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.1 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.2 1993/08/01 05:44:57 mycroft Exp $
+#	$NetBSD: Makefile,v 1.3 1995/03/23 08:35:22 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	morse
 NOMAN=	noman
diff --git a/morse/morse.c b/morse/morse.c
index 46eb1a40..a9045018 100644
--- a/morse/morse.c
+++ b/morse/morse.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: morse.c,v 1.3 1995/03/23 08:35:24 cgd Exp $	*/
+
 /*
- * Copyright (c) 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 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
@@ -32,14 +34,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1988 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)morse.c	5.3 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: morse.c,v 1.2 1993/08/01 18:53:21 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)morse.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: morse.c,v 1.3 1995/03/23 08:35:24 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include <stdio.h>
-- 
cgit v1.2.3-56-ge451