From owner-cvs-all  Tue Dec  5 11: 6:45 2000
From owner-cvs-all@FreeBSD.ORG  Tue Dec  5 11:06:42 2000
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id EF21A37B400; Tue,  5 Dec 2000 11:06:41 -0800 (PST)
Received: (from ru@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id eB5J6fL09669;
	Tue, 5 Dec 2000 11:06:41 -0800 (PST)
	(envelope-from ru)
Message-Id: <200012051906.eB5J6fL09669@freefall.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Tue, 5 Dec 2000 11:06:41 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/groff/devascii R.proto src/contrib/groff/eqn
         neqn.sh src/contrib/groff/groff groff.man src/contrib/groff/grops
         grops.man src/contrib/groff/grotty grotty.man
         src/contrib/groff/libgroff font.cc illegal.cc ...
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

ru          2000/12/05 11:06:41 PST

  Modified files:
    contrib/groff/devascii R.proto 
    contrib/groff/eqn    neqn.sh 
    contrib/groff/groff  groff.man 
    contrib/groff/grops  grops.man 
    contrib/groff/grotty grotty.man 
    contrib/groff/libgroff font.cc illegal.cc 
    contrib/groff/man    groff_out.man 
    contrib/groff/nroff  nroff.man nroff.sh 
    contrib/groff/tmac   eqnrc tmac.tty tmac.tty-char troffrc 
    contrib/groff/troff  troff.man 
  Log:
  Resolve conflicts after v1.16.1 import.
  
  Revision  Changes    Path
  1.3       +3 -0      src/contrib/groff/devascii/R.proto
  1.5       +2 -1      src/contrib/groff/eqn/neqn.sh
  1.5       +96 -59    src/contrib/groff/groff/groff.man
  1.3       +25 -19    src/contrib/groff/grops/grops.man
  1.3       +74 -11    src/contrib/groff/grotty/grotty.man
  1.4       +32 -5     src/contrib/groff/libgroff/font.cc
  1.4       +21 -0     src/contrib/groff/libgroff/illegal.cc
  1.4       +8 -3      src/contrib/groff/man/groff_out.man
  1.5       +41 -42    src/contrib/groff/nroff/nroff.man
  1.9       +74 -63    src/contrib/groff/nroff/nroff.sh
  1.4       +4 -3      src/contrib/groff/tmac/eqnrc
  1.4       +4 -3      src/contrib/groff/tmac/tmac.tty
  1.4       +10 -4     src/contrib/groff/tmac/tmac.tty-char
  1.7       +13 -7     src/contrib/groff/tmac/troffrc
  1.4       +116 -14   src/contrib/groff/troff/troff.man



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message