CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn <lukem%netbsd.org@localhost>]

Module Name:    othersrc
Committed By:   lukem
Date:           Thu Jun  9 14:15:31 UTC 2005

Modified Files:
        othersrc/usr.bin/tnftp/src: fetch.c ftp.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 othersrc/usr.bin/tnftp/src/fetch.c \
    othersrc/usr.bin/tnftp/src/ftp.c

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