From owner-cvs-usrbin Tue Mar 11 05:08:26 1997 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id FAA29817 for cvs-usrbin-outgoing; Tue, 11 Mar 1997 05:08:26 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id FAA29807; Tue, 11 Mar 1997 05:08:20 -0800 (PST) Date: Tue, 11 Mar 1997 05:08:20 -0800 (PST) From: Peter Wemm Message-Id: <199703111308.FAA29807@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin - Imported sources Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 97/03/11 05:08:17 src/usr.bin - Imported sources Update of /home/ncvs/src/usr.bin In directory freefall.freebsd.org:/tmp/cvs-serv29160 Revision/Branch: 1.1.1 Log Message: Import some parts of CSRG 4.4BSD-Lite2 usr.bin sources to fix tree build. Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 U src/usr.bin/basename/basename.1 U src/usr.bin/basename/basename.c U src/usr.bin/basename/Makefile U src/usr.bin/col/Makefile U src/usr.bin/col/col.1 C src/usr.bin/col/col.c U src/usr.bin/col/README U src/usr.bin/colrm/colrm.1 U src/usr.bin/colrm/colrm.c U src/usr.bin/colrm/Makefile U src/usr.bin/column/column.1 U src/usr.bin/column/column.c U src/usr.bin/column/Makefile U src/usr.bin/comm/comm.1 U src/usr.bin/comm/comm.c U src/usr.bin/comm/Makefile U src/usr.bin/cut/cut.1 C src/usr.bin/cut/cut.c U src/usr.bin/cut/Makefile C src/usr.bin/dirname/dirname.c U src/usr.bin/dirname/Makefile U src/usr.bin/du/du.1 C src/usr.bin/du/du.c U src/usr.bin/du/Makefile C src/usr.bin/find/find.1 U src/usr.bin/find/extern.h C src/usr.bin/find/find.c C src/usr.bin/find/main.c U src/usr.bin/find/find.h C src/usr.bin/find/function.c U src/usr.bin/find/ls.c U src/usr.bin/find/Makefile U src/usr.bin/find/misc.c U src/usr.bin/find/operator.c U src/usr.bin/find/option.c C src/usr.bin/finger/util.c U src/usr.bin/finger/extern.h C src/usr.bin/finger/finger.1 C src/usr.bin/finger/finger.c U src/usr.bin/finger/finger.h C src/usr.bin/finger/lprint.c U src/usr.bin/finger/Makefile C src/usr.bin/finger/net.c C src/usr.bin/finger/sprint.c U src/usr.bin/fstat/fstat.1 C src/usr.bin/fstat/fstat.c U src/usr.bin/fstat/Makefile U src/usr.bin/head/head.1 C src/usr.bin/head/head.c U src/usr.bin/head/Makefile U src/usr.bin/hexdump/conv.c U src/usr.bin/hexdump/display.c U src/usr.bin/hexdump/hexdump.1 U src/usr.bin/hexdump/hexdump.c U src/usr.bin/hexdump/hexdump.h C src/usr.bin/hexdump/hexsyntax.c U src/usr.bin/hexdump/Makefile U src/usr.bin/hexdump/od.1 C src/usr.bin/hexdump/odsyntax.c U src/usr.bin/hexdump/parse.c U src/usr.bin/join/join.1 C src/usr.bin/join/join.c U src/usr.bin/join/Makefile U src/usr.bin/mt/Makefile U src/usr.bin/mt/mt.1 C src/usr.bin/mt/mt.c U src/usr.bin/printenv/Makefile U src/usr.bin/printenv/printenv.1 U src/usr.bin/printenv/printenv.c U src/usr.bin/rev/Makefile U src/usr.bin/rev/rev.1 U src/usr.bin/rev/rev.c C src/usr.bin/tr/tr.c U src/usr.bin/tr/extern.h U src/usr.bin/tr/Makefile C src/usr.bin/tr/str.c U src/usr.bin/tr/tr.1 U src/usr.bin/uname/Makefile U src/usr.bin/uname/uname.c U src/usr.bin/uname/uname.1 U src/usr.bin/uniq/Makefile U src/usr.bin/uniq/uniq.c U src/usr.bin/uniq/uniq.1 U src/usr.bin/look/Makefile U src/usr.bin/look/look.1 C src/usr.bin/look/look.c U src/usr.bin/look/pathnames.h 23 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin