CVS commit: othersrc/libexec/tnftpd/src

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

Module Name:    othersrc
Committed By:   lukem
Date:           Tue Aug 10 00:00:36 UTC 2004

Modified Files:
        othersrc/libexec/tnftpd/src: cmds.c conf.c extern.h ftpcmd.y ftpd.c
            popen.c

Log Message:
Merge (RCSID) conflicts.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 othersrc/libexec/tnftpd/src/cmds.c \
    othersrc/libexec/tnftpd/src/extern.h
cvs rdiff -r1.3 -r1.4 othersrc/libexec/tnftpd/src/conf.c
cvs rdiff -r1.7 -r1.8 othersrc/libexec/tnftpd/src/ftpcmd.y \
    othersrc/libexec/tnftpd/src/ftpd.c
cvs rdiff -r1.4 -r1.5 othersrc/libexec/tnftpd/src/popen.c

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