jtc
Wed Nov 30 07:24:39 PST 1994
Update of /b/source/CVS/src/share/man/man3
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/man3

Modified Files:
	Makefile assert.3 bitstring.3 end.3 intro.3 queue.3 stdarg.3 
Log Message:
Merged with 4.4lite.
Changed to conform to NetBSD's new RCS Id convention.


jtc
Wed Nov 30 07:26:57 PST 1994
Update of /b/source/CVS/src/share/man/man4
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/share/man/man4/Makefile
C src/share/man/man4/clnp.4
C src/share/man/man4/cltp.4
C src/share/man/man4/drum.4
C src/share/man/man4/esis.4
C src/share/man/man4/fd.4
C src/share/man/man4/icmp.4
C src/share/man/man4/idp.4
C src/share/man/man4/inet.4
C src/share/man/man4/ip.4
C src/share/man/man4/iso.4
C src/share/man/man4/lo.4
C src/share/man/man4/netintro.4
C src/share/man/man4/ns.4
C src/share/man/man4/nsip.4
C src/share/man/man4/null.4
C src/share/man/man4/pty.4
C src/share/man/man4/route.4
C src/share/man/man4/spp.4
C src/share/man/man4/tcp.4
C src/share/man/man4/termios.4
C src/share/man/man4/tp.4
N src/share/man/man4/tty.4
C src/share/man/man4/udp.4
C src/share/man/man4/unix.4

24 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/share/man/man4