CVS commit: src/gnu/dist/texinfo

[Thomas Klausner <wiz%netbsd.org@localhost>]

Module Name:    src
Committed By:   wiz
Date:           Fri Jan 17 15:25:58 UTC 2003

Modified Files:
        src/gnu/dist/texinfo/info: Makefile.in info.c nodes.c terminal.c
        src/gnu/dist/texinfo/lib: getopt.c system.h
        src/gnu/dist/texinfo/makeinfo: Makefile.in files.c makeinfo.c
        src/gnu/dist/texinfo/po: Makefile.in.in
        src/gnu/dist/texinfo/util: Makefile.in install-info.c texi2dvi
            texindex.c
Removed Files:
        src/gnu/dist/texinfo: acconfig.h configure.in dir-example stamp-h.in
        src/gnu/dist/texinfo/djgpp: README config.bat config.sed config.site
        src/gnu/dist/texinfo/doc: macro.texi stamp-vti.1 userdoc.texi
        src/gnu/dist/texinfo/intl: cat-compat.c gettext.h libgettext.h
            linux-msg.sed po2tbl.sed.in xopen-msg.sed
        src/gnu/dist/texinfo/po: cat-id-tbl.c stamp-cat-id

Log Message:
Handle conflicts after 4.3 import.


To generate a diff of this commit:
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/texinfo/acconfig.h \
    src/gnu/dist/texinfo/configure.in src/gnu/dist/texinfo/dir-example
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/texinfo/stamp-h.in
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/texinfo/djgpp/README \
    src/gnu/dist/texinfo/djgpp/config.bat \
    src/gnu/dist/texinfo/djgpp/config.sed \
    src/gnu/dist/texinfo/djgpp/config.site
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/texinfo/doc/macro.texi \
    src/gnu/dist/texinfo/doc/stamp-vti.1 \
    src/gnu/dist/texinfo/doc/userdoc.texi
cvs rdiff -r1.2 -r1.3 src/gnu/dist/texinfo/info/Makefile.in \
    src/gnu/dist/texinfo/info/nodes.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/texinfo/info/info.c \
    src/gnu/dist/texinfo/info/terminal.c
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/texinfo/intl/cat-compat.c \
    src/gnu/dist/texinfo/intl/linux-msg.sed \
    src/gnu/dist/texinfo/intl/po2tbl.sed.in
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/texinfo/intl/gettext.h \
    src/gnu/dist/texinfo/intl/libgettext.h
cvs rdiff -r1.2 -r0 src/gnu/dist/texinfo/intl/xopen-msg.sed
cvs rdiff -r1.3 -r1.4 src/gnu/dist/texinfo/lib/getopt.c
cvs rdiff -r1.4 -r1.5 src/gnu/dist/texinfo/lib/system.h
cvs rdiff -r1.2 -r1.3 src/gnu/dist/texinfo/makeinfo/Makefile.in \
    src/gnu/dist/texinfo/makeinfo/files.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/texinfo/makeinfo/makeinfo.c
cvs rdiff -r1.2 -r1.3 src/gnu/dist/texinfo/po/Makefile.in.in
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/texinfo/po/cat-id-tbl.c
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/texinfo/po/stamp-cat-id
cvs rdiff -r1.2 -r1.3 src/gnu/dist/texinfo/util/Makefile.in
cvs rdiff -r1.3 -r1.4 src/gnu/dist/texinfo/util/install-info.c \
    src/gnu/dist/texinfo/util/texi2dvi 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.