CVS commit: src/gnu/dist/xcvs

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri Jun 23 22:44:11 UTC 2006

Modified Files:
        src/gnu/dist/xcvs: ChangeLog configure
        src/gnu/dist/xcvs/src: ChangeLog buffer.c client.c commit.c cvs.h
            filesubr.c history.c log.c main.c mkmodules.c rcs.c root.c run.c
            server.c tag.c update.c
Removed Files:
        src/gnu/dist/xcvs/contrib: .cvsignore
        src/gnu/dist/xcvs/diff: .cvsignore
        src/gnu/dist/xcvs/doc: .cvsignore
        src/gnu/dist/xcvs/lib: .cvsignore
        src/gnu/dist/xcvs/man: .cvsignore
        src/gnu/dist/xcvs/src: .cvsignore

Log Message:
merge conflicts.
XXX: hack configure so that it works with the removal with the tools and
other os's. Perhaps in the future we should not do such cleanup.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 src/gnu/dist/xcvs/ChangeLog
cvs rdiff -r1.1.1.2 -r1.2 src/gnu/dist/xcvs/configure
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/xcvs/contrib/.cvsignore
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/xcvs/diff/.cvsignore
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/xcvs/doc/.cvsignore
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/xcvs/lib/.cvsignore
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/xcvs/man/.cvsignore
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/xcvs/src/.cvsignore
cvs rdiff -r1.2 -r1.3 src/gnu/dist/xcvs/src/ChangeLog \
    src/gnu/dist/xcvs/src/buffer.c src/gnu/dist/xcvs/src/cvs.h \
    src/gnu/dist/xcvs/src/history.c src/gnu/dist/xcvs/src/main.c \
    src/gnu/dist/xcvs/src/mkmodules.c src/gnu/dist/xcvs/src/root.c \
    src/gnu/dist/xcvs/src/run.c src/gnu/dist/xcvs/src/update.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/xcvs/src/client.c \
    src/gnu/dist/xcvs/src/server.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/xcvs/src/commit.c \
    src/gnu/dist/xcvs/src/rcs.c
cvs rdiff -r1.3 -r1.4 src/gnu/dist/xcvs/src/filesubr.c \
    src/gnu/dist/xcvs/src/log.c src/gnu/dist/xcvs/src/tag.c

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