From owner-cvs-gnu  Sat Oct 28 14:51:10 1995
Return-Path: owner-cvs-gnu
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id OAA01837
          for cvs-gnu-outgoing; Sat, 28 Oct 1995 14:51:10 -0700
Received: (from peter@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id OAA01822
          ; Sat, 28 Oct 1995 14:51:02 -0700
Date: Sat, 28 Oct 1995 14:51:02 -0700
From: Peter Wemm <peter>
Message-Id: <199510282151.OAA01822@freefall.freebsd.org>
To: CVS-commiters, cvs-gnu
Subject: cvs commit: src/gnu/usr.bin/rcs/rlog rlog.1 rlog.c
Sender: owner-cvs-gnu@FreeBSD.org
Precedence: bulk

hsu         95/10/28 14:51:01

  Modified:    gnu/usr.bin/rcs  CREDITS NEWS REFS rcstest
               gnu/usr.bin/rcs/ci  ci.1 ci.c
               gnu/usr.bin/rcs/co  co.1 co.c
               gnu/usr.bin/rcs/doc  rcs.ms
               gnu/usr.bin/rcs/ident  ident.1 ident.c
               gnu/usr.bin/rcs/lib  Makefile conf.h maketime.c merger.c
                        partime.c rcsbase.h  rcsedit.c rcsfcmp.c rcsfnms.c
                        rcsgen.c rcskeep.c rcskeys.c  rcslex.c rcsmap.c
                        rcsrev.c rcssyn.c rcstime.c rcsutil.c
               gnu/usr.bin/rcs/merge  merge.1 merge.c
               gnu/usr.bin/rcs/rcs  rcs.1 rcs.c rcsfile.5 rcsintro.1
               gnu/usr.bin/rcs/rcsclean  rcsclean.1 rcsclean.c
               gnu/usr.bin/rcs/rcsdiff  rcsdiff.1 rcsdiff.c
               gnu/usr.bin/rcs/rcsfreeze  rcsfreeze.1 rcsfreeze.sh
               gnu/usr.bin/rcs/rcsmerge  rcsmerge.1 rcsmerge.c
               gnu/usr.bin/rcs/rlog  rlog.1 rlog.c
  Log:
  First part of import conflict merge from rcs-5.7 import.
  
  All those $Log$ entries, combined with the whitespace changes are a real
  pain.
  
  I'm committing this now, before it's completely finished to get it compiling
  and working again ASAP.  Some of the FreeBSD specific features are not working
  in this commit yet (mainly rlog stuff and $FreeBSD$ support)