Module Name:	othersrc
Committed By:	lukem
Date:		Mon Jan  3 10:08:40 UTC 2005

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

Log Message:
merge RCSID conflicts (I need to improve how I do the sync)


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 othersrc/usr.bin/tnftp/src/cmds.c \
    othersrc/usr.bin/tnftp/src/ftp.c othersrc/usr.bin/tnftp/src/progressbar.c
cvs rdiff -r1.2 -r1.3 othersrc/usr.bin/tnftp/src/cmdtab.c \
    othersrc/usr.bin/tnftp/src/domacro.c othersrc/usr.bin/tnftp/src/extern.h \
    othersrc/usr.bin/tnftp/src/ftp_var.h \
    othersrc/usr.bin/tnftp/src/progressbar.h \
    othersrc/usr.bin/tnftp/src/ruserpass.c
cvs rdiff -r1.4 -r1.5 othersrc/usr.bin/tnftp/src/fetch.c \
    othersrc/usr.bin/tnftp/src/ftp.1 othersrc/usr.bin/tnftp/src/main.c \
    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.