Subject: CVS commit: othersrc/libexec/tnftpd/src
To: None <source-changes@NetBSD.org>
From: Luke Mewburn <lukem@netbsd.org>
List: source-changes
Date: 12/01/2004 09:08:52
Module Name: othersrc
Committed By: lukem
Date: Wed Dec 1 09:08:52 UTC 2004
Modified Files:
othersrc/libexec/tnftpd/src: extern.h ftpcmd.y ftpd.c
Log Message:
merge conflicts. (will need HAVE_PW_CHANGE autoconf test)
To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 othersrc/libexec/tnftpd/src/extern.h
cvs rdiff -r1.8 -r1.9 othersrc/libexec/tnftpd/src/ftpcmd.y
cvs rdiff -r1.9 -r1.10 othersrc/libexec/tnftpd/src/ftpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.