CVS commit: src/gnu/dist/texinfo

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

Module Name:    src
Committed By:   christos
Date:           Tue Sep  2 08:00:24 UTC 2008

Modified Files:
        src/gnu/dist/texinfo: Makefile.in aclocal.m4 configure configure.ac
        src/gnu/dist/texinfo/doc: Makefile.in texindex.1
        src/gnu/dist/texinfo/info: Makefile.in echo-area.c info.c infokey.c
            nodes.c session.c terminal.c
        src/gnu/dist/texinfo/lib: Makefile.in getopt.c system.h
        src/gnu/dist/texinfo/m4: Makefile.in
        src/gnu/dist/texinfo/makeinfo: Makefile.in cmds.c files.c files.h
            makeinfo.c node.c
        src/gnu/dist/texinfo/makeinfo/tests: Makefile.in
        src/gnu/dist/texinfo/util: Makefile.in install-info.c texi2dvi
            texindex.c
Removed Files:
        src/gnu/dist/texinfo/info: doc.c funs.h key.c

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 src/gnu/dist/texinfo/Makefile.in \
    src/gnu/dist/texinfo/aclocal.m4 src/gnu/dist/texinfo/configure
cvs rdiff -r1.4 -r1.5 src/gnu/dist/texinfo/configure.ac
cvs rdiff -r1.7 -r1.8 src/gnu/dist/texinfo/doc/Makefile.in
cvs rdiff -r1.2 -r1.3 src/gnu/dist/texinfo/doc/texindex.1
cvs rdiff -r1.8 -r1.9 src/gnu/dist/texinfo/info/Makefile.in
cvs rdiff -r1.1.1.4 -r0 src/gnu/dist/texinfo/info/doc.c \
    src/gnu/dist/texinfo/info/funs.h
cvs rdiff -r1.2 -r1.3 src/gnu/dist/texinfo/info/echo-area.c \
    src/gnu/dist/texinfo/info/infokey.c
cvs rdiff -r1.10 -r1.11 src/gnu/dist/texinfo/info/info.c
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/texinfo/info/key.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/texinfo/info/nodes.c
cvs rdiff -r1.3 -r1.4 src/gnu/dist/texinfo/info/session.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/texinfo/info/terminal.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/texinfo/lib/Makefile.in \
    src/gnu/dist/texinfo/lib/getopt.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/texinfo/lib/system.h
cvs rdiff -r1.5 -r1.6 src/gnu/dist/texinfo/m4/Makefile.in
cvs rdiff -r1.8 -r1.9 src/gnu/dist/texinfo/makeinfo/Makefile.in
cvs rdiff -r1.2 -r1.3 src/gnu/dist/texinfo/makeinfo/cmds.c \
    src/gnu/dist/texinfo/makeinfo/files.h
cvs rdiff -r1.7 -r1.8 src/gnu/dist/texinfo/makeinfo/files.c
cvs rdiff -r1.13 -r1.14 src/gnu/dist/texinfo/makeinfo/makeinfo.c
cvs rdiff -r1.3 -r1.4 src/gnu/dist/texinfo/makeinfo/node.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/texinfo/makeinfo/tests/Makefile.in
cvs rdiff -r1.9 -r1.10 src/gnu/dist/texinfo/util/Makefile.in
cvs rdiff -r1.8 -r1.9 src/gnu/dist/texinfo/util/install-info.c \
    src/gnu/dist/texinfo/util/texi2dvi
cvs rdiff -r1.10 -r1.11 src/gnu/dist/texinfo/util/texindex.c

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