Module Name:	src
Committed By:	wiz
Date:		Thu Jan 16 02:33:26 UTC 2003

Modified Files:
	src/gnu/dist/cvs/doc: cvs.texinfo
	src/gnu/dist/cvs/src: buffer.c checkout.c client.c commit.c cvs.h
	    history.c lock.c logmsg.c main.c parseinfo.c rcs.c recurse.c
	    server.c tag.c update.c
Removed Files:
	src/gnu/dist/cvs: acconfig.h stamp-h1.in
	src/gnu/dist/cvs/lib: fnmatch.h hostname.c
	src/gnu/dist/cvs/src: options.h.in stamp-h2.in version.h version.h.in

Log Message:
Fix conflicts, merge to 1.11.4.


To generate a diff of this commit:
cvs rdiff -r1.1.1.3 -r0 src/gnu/dist/cvs/acconfig.h
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/cvs/stamp-h1.in
cvs rdiff -r1.4 -r1.5 src/gnu/dist/cvs/doc/cvs.texinfo
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/cvs/lib/fnmatch.h \
    src/gnu/dist/cvs/lib/hostname.c
cvs rdiff -r1.2 -r1.3 src/gnu/dist/cvs/src/buffer.c
cvs rdiff -r1.4 -r1.5 src/gnu/dist/cvs/src/checkout.c \
    src/gnu/dist/cvs/src/commit.c src/gnu/dist/cvs/src/history.c \
    src/gnu/dist/cvs/src/lock.c src/gnu/dist/cvs/src/parseinfo.c \
    src/gnu/dist/cvs/src/recurse.c src/gnu/dist/cvs/src/tag.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/cvs/src/client.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/cvs/src/cvs.h \
    src/gnu/dist/cvs/src/logmsg.c src/gnu/dist/cvs/src/main.c \
    src/gnu/dist/cvs/src/update.c
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/cvs/src/options.h.in \
    src/gnu/dist/cvs/src/stamp-h2.in src/gnu/dist/cvs/src/version.h \
    src/gnu/dist/cvs/src/version.h.in
cvs rdiff -r1.8 -r1.9 src/gnu/dist/cvs/src/rcs.c \
    src/gnu/dist/cvs/src/server.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.