Subject: CVS commit: othersrc/libexec/tnftpd/src
To: None <source-changes@netbsd.org>
From: Luke Mewburn <lukem@netbsd.org>
List: source-changes
Date: 12/08/2002 14:37:14
Module Name: othersrc
Committed By: lukem
Date: Sun Dec 8 12:37:14 UTC 2002
Modified Files:
othersrc/libexec/tnftpd/src: conf.c extern.h ftpcmd.y ftpd.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 othersrc/libexec/tnftpd/src/conf.c \
othersrc/libexec/tnftpd/src/extern.h othersrc/libexec/tnftpd/src/ftpcmd.y \
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.