Module Name:	src
Committed By:	christos
Date:		Wed Apr 20 01:52:12 UTC 2005

Modified Files:
	src/gnu/dist/cvs: AUTHORS BUGS ChangeLog HACKING Makefile.in NEWS
	    aclocal.m4 configure configure.in
	src/gnu/dist/cvs/contrib: Makefile.am commit_prep.in cvs_acls.in log.in
	    log_accum.in mfpipe.in rcslock.in
	src/gnu/dist/cvs/diff: ChangeLog Makefile.in
	src/gnu/dist/cvs/doc: ChangeLog Makefile.am Makefile.in cvs.1
	    cvs.texinfo stamp-1 stamp-vti version-client.texi version.texi
	src/gnu/dist/cvs/lib: ChangeLog Makefile.am Makefile.in system.h
	    xtime.h
	src/gnu/dist/cvs/man: ChangeLog Makefile.am Makefile.in
	src/gnu/dist/cvs/src: ChangeLog Makefile.am add.c admin.c annotate.c
	    buffer.c checkout.c client.c commit.c cvs.h diff.c edit.c entries.c
	    filesubr.c find_names.c history.c history.h ignore.c lock.c log.c
	    logmsg.c main.c mkmodules.c modules.c parseinfo.c patch.c rcs.c
	    recurse.c remove.c repos.c root.c root.h sanity.sh server.c subr.c
	    tag.c update.c vers_ts.c
Removed Files:
	src/gnu/dist/cvs/doc: mkman.in

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 src/gnu/dist/cvs/AUTHORS src/gnu/dist/cvs/BUGS \
    src/gnu/dist/cvs/HACKING src/gnu/dist/cvs/Makefile.in
cvs rdiff -r1.3 -r1.4 src/gnu/dist/cvs/ChangeLog src/gnu/dist/cvs/NEWS \
    src/gnu/dist/cvs/aclocal.m4 src/gnu/dist/cvs/configure \
    src/gnu/dist/cvs/configure.in
cvs rdiff -r1.2 -r1.3 src/gnu/dist/cvs/contrib/Makefile.am \
    src/gnu/dist/cvs/contrib/commit_prep.in
cvs rdiff -r1.1 -r1.2 src/gnu/dist/cvs/contrib/cvs_acls.in \
    src/gnu/dist/cvs/contrib/log.in src/gnu/dist/cvs/contrib/mfpipe.in \
    src/gnu/dist/cvs/contrib/rcslock.in
cvs rdiff -r1.3 -r1.4 src/gnu/dist/cvs/contrib/log_accum.in
cvs rdiff -r1.2 -r1.3 src/gnu/dist/cvs/diff/ChangeLog \
    src/gnu/dist/cvs/diff/Makefile.in
cvs rdiff -r1.3 -r1.4 src/gnu/dist/cvs/doc/ChangeLog \
    src/gnu/dist/cvs/doc/Makefile.am
cvs rdiff -r1.2 -r1.3 src/gnu/dist/cvs/doc/Makefile.in \
    src/gnu/dist/cvs/doc/cvs.1
cvs rdiff -r1.9 -r1.10 src/gnu/dist/cvs/doc/cvs.texinfo
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/cvs/doc/mkman.in
cvs rdiff -r1.6 -r1.7 src/gnu/dist/cvs/doc/stamp-1 \
    src/gnu/dist/cvs/doc/stamp-vti src/gnu/dist/cvs/doc/version-client.texi \
    src/gnu/dist/cvs/doc/version.texi
cvs rdiff -r1.3 -r1.4 src/gnu/dist/cvs/lib/ChangeLog \
    src/gnu/dist/cvs/lib/Makefile.in
cvs rdiff -r1.4 -r1.5 src/gnu/dist/cvs/lib/Makefile.am
cvs rdiff -r1.2 -r1.3 src/gnu/dist/cvs/lib/system.h
cvs rdiff -r1.1 -r1.2 src/gnu/dist/cvs/lib/xtime.h
cvs rdiff -r1.2 -r1.3 src/gnu/dist/cvs/man/ChangeLog \
    src/gnu/dist/cvs/man/Makefile.in
cvs rdiff -r1.3 -r1.4 src/gnu/dist/cvs/man/Makefile.am
cvs rdiff -r1.3 -r1.4 src/gnu/dist/cvs/src/ChangeLog \
    src/gnu/dist/cvs/src/Makefile.am src/gnu/dist/cvs/src/admin.c \
    src/gnu/dist/cvs/src/annotate.c src/gnu/dist/cvs/src/find_names.c \
    src/gnu/dist/cvs/src/root.h src/gnu/dist/cvs/src/sanity.sh
cvs rdiff -r1.2 -r1.3 src/gnu/dist/cvs/src/add.c \
    src/gnu/dist/cvs/src/history.h src/gnu/dist/cvs/src/log.c \
    src/gnu/dist/cvs/src/vers_ts.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/cvs/src/buffer.c \
    src/gnu/dist/cvs/src/diff.c src/gnu/dist/cvs/src/edit.c \
    src/gnu/dist/cvs/src/remove.c src/gnu/dist/cvs/src/repos.c \
    src/gnu/dist/cvs/src/root.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/cvs/src/checkout.c \
    src/gnu/dist/cvs/src/mkmodules.c src/gnu/dist/cvs/src/tag.c
cvs rdiff -r1.19 -r1.20 src/gnu/dist/cvs/src/client.c
cvs rdiff -r1.14 -r1.15 src/gnu/dist/cvs/src/commit.c \
    src/gnu/dist/cvs/src/cvs.h
cvs rdiff -r1.6 -r1.7 src/gnu/dist/cvs/src/entries.c \
    src/gnu/dist/cvs/src/filesubr.c src/gnu/dist/cvs/src/subr.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/cvs/src/history.c \
    src/gnu/dist/cvs/src/lock.c src/gnu/dist/cvs/src/parseinfo.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/cvs/src/ignore.c
cvs rdiff -r1.10 -r1.11 src/gnu/dist/cvs/src/logmsg.c \
    src/gnu/dist/cvs/src/recurse.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/cvs/src/main.c \
    src/gnu/dist/cvs/src/update.c
cvs rdiff -r1.4 -r1.5 src/gnu/dist/cvs/src/modules.c \
    src/gnu/dist/cvs/src/patch.c
cvs rdiff -r1.13 -r1.14 src/gnu/dist/cvs/src/rcs.c
cvs rdiff -r1.17 -r1.18 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.