Date: Thu, 14 Jan 1999 11:56:32 -0800 (PST) From: Mark Murray <markm@FreeBSD.ORG> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: cvs commit: src/contrib/texinfo/info doc.c funs.h infomap.c nodemenu.c session.c signals.c terminal.c src/contrib/texinfo/makeinfo makeinfo.c src/contrib/texinfo/util install-info.c Message-ID: <199901141956.LAA11738@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
markm 1999/01/14 11:56:32 PST
Modified files:
contrib/texinfo/info doc.c funs.h infomap.c nodemenu.c
session.c signals.c terminal.c
contrib/texinfo/makeinfo makeinfo.c
contrib/texinfo/util install-info.c
Log:
Resove conflicts.
Revision Changes Path
1.2 +3 -3 src/contrib/texinfo/info/doc.c
1.2 +2 -2 src/contrib/texinfo/info/funs.h
1.3 +117 -77 src/contrib/texinfo/info/infomap.c
1.3 +66 -56 src/contrib/texinfo/info/nodemenu.c
1.3 +1431 -1443src/contrib/texinfo/info/session.c
1.3 +60 -64 src/contrib/texinfo/info/signals.c
1.4 +155 -106 src/contrib/texinfo/info/terminal.c
1.4 +3241 -2955src/contrib/texinfo/makeinfo/makeinfo.c
1.7 +181 -88 src/contrib/texinfo/util/install-info.c
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199901141956.LAA11738>