Module Name:	pkgsrc
Committed By:	lukem
Date:		Sat May 14 05:13:09 UTC 2005

Modified Files:
	pkgsrc/net/tnftp/files: ChangeLog config.h.in configure configure.in
	    tnftp.h
	pkgsrc/net/tnftp/files/src: ftp.c main.c util.c version.h

Log Message:
Merge 20050514


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 pkgsrc/net/tnftp/files/ChangeLog
cvs rdiff -r1.5 -r1.6 pkgsrc/net/tnftp/files/config.h.in \
    pkgsrc/net/tnftp/files/configure.in pkgsrc/net/tnftp/files/tnftp.h
cvs rdiff -r1.6 -r1.7 pkgsrc/net/tnftp/files/configure
cvs rdiff -r1.4 -r1.5 pkgsrc/net/tnftp/files/src/ftp.c \
    pkgsrc/net/tnftp/files/src/main.c pkgsrc/net/tnftp/files/src/util.c
cvs rdiff -r1.3 -r1.4 pkgsrc/net/tnftp/files/src/version.h

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