Module Name:	othersrc
Committed By:	lukem
Date:		Mon Aug  6 04:33:24 UTC 2007

Modified Files:
	othersrc/usr.bin/tnftp/src: cmds.c cmdtab.c complete.c domacro.c
	    fetch.c ftp.1 ftp.c ftp_var.h main.c progressbar.c progressbar.h
	    ruserpass.c util.c

Log Message:
Merge NetBSD-20070722.
Reduce differences between upstream and this version.


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 othersrc/usr.bin/tnftp/src/cmds.c
cvs rdiff -r1.8 -r1.9 othersrc/usr.bin/tnftp/src/cmdtab.c
cvs rdiff -r1.7 -r1.8 othersrc/usr.bin/tnftp/src/complete.c \
    othersrc/usr.bin/tnftp/src/ftp_var.h \
    othersrc/usr.bin/tnftp/src/ruserpass.c
cvs rdiff -r1.6 -r1.7 othersrc/usr.bin/tnftp/src/domacro.c \
    othersrc/usr.bin/tnftp/src/progressbar.h
cvs rdiff -r1.14 -r1.15 othersrc/usr.bin/tnftp/src/fetch.c
cvs rdiff -r1.10 -r1.11 othersrc/usr.bin/tnftp/src/ftp.1
cvs rdiff -r1.15 -r1.16 othersrc/usr.bin/tnftp/src/ftp.c
cvs rdiff -r1.13 -r1.14 othersrc/usr.bin/tnftp/src/main.c
cvs rdiff -r1.11 -r1.12 othersrc/usr.bin/tnftp/src/progressbar.c
cvs rdiff -r1.17 -r1.18 othersrc/usr.bin/tnftp/src/util.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.