CVS: cvs.openbsd.org: src

[Marc Espie <espie_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org>]

CVSROOT:	/cvs
Module name:	src
Changes by:	espie_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org	2002/06/10 07:51:04

Modified files:
	gnu/usr.bin/texinfo: Makefile.am Makefile.in config.guess 
	                     configure dir-example mkinstalldirs 
	gnu/usr.bin/texinfo/doc: Makefile.am Makefile.in info-stnd.texi 
	                         info.texi texinfo.tex texinfo.txi 
	gnu/usr.bin/texinfo/info: Makefile.am Makefile.in display.c 
	                          echo-area.c filesys.c indices.c info.c 
	                          info.h infodoc.c infomap.c m-x.c 
	                          makedoc.c man.c session.c termdep.h 
	                          terminal.c variables.c window.c 
	gnu/usr.bin/texinfo/lib: Makefile.am Makefile.in system.h 
	gnu/usr.bin/texinfo/makeinfo: Makefile.am Makefile.in makeinfo.c 
	                              makeinfo.h multi.c 
	gnu/usr.bin/texinfo/po: Makefile.in.in 
	gnu/usr.bin/texinfo/util: Makefile.am Makefile.in install-info.c 
	                          texi2dvi texindex.c 
Added files:
	gnu/usr.bin/texinfo: README-alpha THANKS config.h.in dir 
	                     install.sh texinfo.tex texinfo.texi 
	gnu/usr.bin/texinfo/doc: texinfo.texi 
	gnu/usr.bin/texinfo/info: NEWS clib.c clib.h diffs dribble 
	                          echo_area.c echo_area.h general.h 
	                          info-stnd.texi info.1 info.texi 
	                          userdoc.texi xmalloc.c 
	gnu/usr.bin/texinfo/makeinfo: macro.texi makeinfo.texi 
	                              multiformat.texi 
	gnu/usr.bin/texinfo/po: ChangeLog 
	gnu/usr.bin/texinfo/util: mkinstalldirs update-info 

Log message:
brain-dead cvs conflict merge