Date: Sun, 22 Jun 1997 03:59:26 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.ORG> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG Subject: cvs commit: src/contrib/cvs/src cvs.h import.c lock.c main.c mkmodules.c rcs.c rcs.h server.c Message-ID: <199706221059.DAA13795@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 1997/06/22 03:59:26 PDT
Modified files:
contrib/cvs/src cvs.h import.c lock.c main.c mkmodules.c
rcs.c rcs.h server.c
Log:
merge conflicts
Revision Changes Path
1.5 +6 -0 src/contrib/cvs/src/cvs.h
1.3 +107 -35 src/contrib/cvs/src/import.c
1.4 +1 -1 src/contrib/cvs/src/lock.c
1.9 +16 -4 src/contrib/cvs/src/main.c
1.4 +14 -10 src/contrib/cvs/src/mkmodules.c
1.9 +10 -2 src/contrib/cvs/src/rcs.c
1.3 +4 -0 src/contrib/cvs/src/rcs.h
1.4 +46 -1 src/contrib/cvs/src/server.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199706221059.DAA13795>