From owner-cvs-include  Tue Mar 11 03:11:48 1997
Return-Path: <owner-cvs-include>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id DAA14887
          for cvs-include-outgoing; Tue, 11 Mar 1997 03:11:48 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id DAA14878;
          Tue, 11 Mar 1997 03:11:46 -0800 (PST)
Date: Tue, 11 Mar 1997 03:11:46 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199703111111.DAA14878@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-include
Subject: cvs commit:  src/include - Imported sources
Sender: owner-cvs-include@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       97/03/11 03:11:45

  src/include - Imported sources
  Update of /home/ncvs/src/include
  In directory freefall.freebsd.org:/tmp/cvs-serv14651
  
  Revision/Branch: 1.1.1
  
  Log Message:
  Import CSRG 4.4BSD-Lite2 includes onto vendor branch
  
  Status:
  
  Vendor Tag:	CSRG
  Release Tags:	bsd_44_lite_2
  		
  U src/include/assert.h
  U src/include/bitstring.h
  U src/include/ctype.h
  C src/include/dirent.h
  U src/include/disktab.h
  U src/include/err.h
  U src/include/fnmatch.h
  U src/include/fstab.h
  U src/include/fts.h
  U src/include/glob.h
  U src/include/grp.h
  U src/include/kvm.h
  U src/include/limits.h
  U src/include/locale.h
  U src/include/Makefile
  U src/include/math.h
  U src/include/memory.h
  C src/include/mpool.h
  U src/include/netdb.h
  U src/include/nlist.h
  U src/include/paths.h
  U src/include/pwd.h
  U src/include/regex.h
  U src/include/rune.h
  U src/include/ranlib.h
  U src/include/regexp.h
  U src/include/sgtty.h
  U src/include/resolv.h
  U src/include/runetype.h
  U src/include/setjmp.h
  U src/include/signal.h
  U src/include/stab.h
  U src/include/stddef.h
  C src/include/stdio.h
  C src/include/stdlib.h
  U src/include/string.h
  U src/include/strings.h
  U src/include/struct.h
  U src/include/sysexits.h
  U src/include/tar.h
  U src/include/time.h
  U src/include/ttyent.h
  C src/include/tzfile.h
  C src/include/unistd.h
  U src/include/utime.h
  U src/include/utmp.h
  U src/include/vis.h
  U src/include/a.out.h
  U src/include/ar.h
  U src/include/protocols/dumprestore.h
  U src/include/protocols/routed.h
  U src/include/protocols/rwhod.h
  U src/include/protocols/talkd.h
  U src/include/protocols/timed.h
  U src/include/arpa/ftp.h
  U src/include/arpa/inet.h
  U src/include/arpa/nameser.h
  U src/include/arpa/telnet.h
  U src/include/arpa/tftp.h
  
  6 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jCSRG:yesterday -jCSRG src/include