From owner-cvs-all  Thu Jan 24  9:58:48 2002
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 D7F8A37B402; Thu, 24 Jan 2002 09:58:42 -0800 (PST)
Received: (from dwmalone@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g0OHwgV03094;
	Thu, 24 Jan 2002 09:58:42 -0800 (PST)
	(envelope-from dwmalone)
Message-Id: <200201241758.g0OHwgV03094@freefall.freebsd.org>
From: David Malone <dwmalone@FreeBSD.org>
Date: Thu, 24 Jan 2002 09:58:42 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/top display.c machine.h utils.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

dwmalone    2002/01/24 09:58:42 PST

  Modified files:
    contrib/top          display.c machine.h utils.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.6       +4 -4      src/contrib/top/display.c
  1.5       +11 -1     src/contrib/top/machine.h
  1.4       +25 -5     src/contrib/top/utils.c

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