Module Name:	pkgsrc
Committed By:	lukem
Date:		Sat Jun 25 07:00:41 UTC 2005

Modified Files:
	pkgsrc/net/tnftp/files: ChangeLog acconfig.h aclocal.m4 config.h.in
	    configure configure.in tnftp.h

Log Message:
Merge tnftp 20050625


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 pkgsrc/net/tnftp/files/ChangeLog
cvs rdiff -r1.3 -r1.4 pkgsrc/net/tnftp/files/acconfig.h
cvs rdiff -r1.2 -r1.3 pkgsrc/net/tnftp/files/aclocal.m4
cvs rdiff -r1.7 -r1.8 pkgsrc/net/tnftp/files/config.h.in \
    pkgsrc/net/tnftp/files/configure.in
cvs rdiff -r1.8 -r1.9 pkgsrc/net/tnftp/files/configure \
    pkgsrc/net/tnftp/files/tnftp.h

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