CVS commit: src/gnu/dist/texinfo

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

Module Name:    src
Committed By:   christos
Date:           Tue Sep  2 08:41:51 UTC 2008

Modified Files:
        src/gnu/dist/texinfo/info: echo-area.c infokey.c session.c
        src/gnu/dist/texinfo/makeinfo: files.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/gnu/dist/texinfo/info/echo-area.c \
    src/gnu/dist/texinfo/info/infokey.c
cvs rdiff -r1.4 -r1.5 src/gnu/dist/texinfo/info/session.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/texinfo/makeinfo/files.c

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