From owner-cvs-all Thu Jan 14 11:57:10 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id LAA28129 for cvs-all-outgoing; Thu, 14 Jan 1999 11:57:10 -0800 (PST) (envelope-from owner-cvs-all@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id LAA28115; Thu, 14 Jan 1999 11:57:07 -0800 (PST) (envelope-from markm@FreeBSD.org) From: Mark Murray Received: (from markm@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id LAA11738; Thu, 14 Jan 1999 11:56:32 -0800 (PST) Date: Thu, 14 Jan 1999 11:56:32 -0800 (PST) Message-Id: <199901141956.LAA11738@freefall.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 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk 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