tls
Mon Sep  4 21:20:24 EDT 1995
Update of /a/cvsroot/src/usr.bin/ftp
In directory pain.lcs.mit.edu:/a/users/tls/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/ftp/Makefile
C src/usr.bin/ftp/ruserpass.c
C src/usr.bin/ftp/pathnames.h
I src/usr.bin/ftp/obj
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
C 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
I src/usr.bin/ftp/tags

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

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