Module Name:	othersrc
Committed By:	lukem
Date:		Thu Jun  7 03:43:42 UTC 2007

Update of /cvsroot/othersrc/usr.bin/tnftp/src
In directory ivanova.netbsd.org:/tmp/cvs-serv26415

Log Message:
Update to NetBSD ftp 20070605


Vendor Tag:	TNF
Release Tags:	NetBSD-20070605
		
C othersrc/usr.bin/tnftp/src/Makefile
C othersrc/usr.bin/tnftp/src/cmds.c
U othersrc/usr.bin/tnftp/src/cmdtab.c
U othersrc/usr.bin/tnftp/src/complete.c
U othersrc/usr.bin/tnftp/src/domacro.c
C othersrc/usr.bin/tnftp/src/extern.h
C othersrc/usr.bin/tnftp/src/fetch.c
C othersrc/usr.bin/tnftp/src/ftp.1
C othersrc/usr.bin/tnftp/src/ftp.c
U othersrc/usr.bin/tnftp/src/ftp_var.h
C othersrc/usr.bin/tnftp/src/main.c
U othersrc/usr.bin/tnftp/src/progressbar.c
U othersrc/usr.bin/tnftp/src/progressbar.h
U othersrc/usr.bin/tnftp/src/ruserpass.c
C othersrc/usr.bin/tnftp/src/util.c
U othersrc/usr.bin/tnftp/src/version.h

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

	cvs checkout -jTNF:yesterday -jTNF othersrc/usr.bin/tnftp/src