From owner-cvs-usrbin Sat Jul 5 21:08:38 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id VAA04916 for cvs-usrbin-outgoing; Sat, 5 Jul 1997 21:08:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id VAA04773; Sat, 5 Jul 1997 21:02:49 -0700 (PDT) From: Bruce Evans Received: (from bde@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id VAA15435; Sat, 5 Jul 1997 21:02:34 -0700 (PDT) Date: Sat, 5 Jul 1997 21:02:34 -0700 (PDT) Message-Id: <199707060402.VAA15435@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-usrbin@FreeBSD.ORG Subject: cvs commit: src/usr.bin/systat - Imported sources Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk bde 1997/07/05 21:02:34 PDT src/usr.bin/systat - Imported sources Update of /home/ncvs/src/usr.bin/systat In directory freefall.freebsd.org:/c/bde/src/systat Log Message: Import Lite2's src/usr.bin/systat. cmds.c is still on the vendor branch and this import just breaks it. Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 U src/usr.bin/systat/extern.h U src/usr.bin/systat/systat.1 U src/usr.bin/systat/cmdtab.c U src/usr.bin/systat/disks.c U src/usr.bin/systat/fetch.c U src/usr.bin/systat/iostat.c U src/usr.bin/systat/keyboard.c U src/usr.bin/systat/main.c U src/usr.bin/systat/mbufs.c U src/usr.bin/systat/netcmds.c U src/usr.bin/systat/netstat.c U src/usr.bin/systat/pigs.c C src/usr.bin/systat/swap.c U src/usr.bin/systat/systat.h U src/usr.bin/systat/vmstat.c U src/usr.bin/systat/Makefile U src/usr.bin/systat/cmds.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/systat