cgd
Wed Aug 24 20:28:02 PDT 1994
Update of /b/source/CVS/src/usr.bin/ftp
In directory sun-lamp.cs.berkeley.edu:/e/users/cgd/trees/ftp

Revision/Branch: 1.1.2

Log Message:
import from 4.4-Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
I src/usr.bin/ftp/tags
C src/usr.bin/ftp/ruserpass.c
C src/usr.bin/ftp/pathnames.h
C src/usr.bin/ftp/main.c
C src/usr.bin/ftp/ftp_var.h
C src/usr.bin/ftp/ftp.c
C src/usr.bin/ftp/ftp.1
N src/usr.bin/ftp/extern.h
C src/usr.bin/ftp/domacro.c
C src/usr.bin/ftp/cmdtab.c
C src/usr.bin/ftp/cmds.c
C src/usr.bin/ftp/Makefile

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

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/ftp


------------------------------------------------------------------------------