Module Name:	othersrc
Committed By:	lukem
Date:		Wed Dec 10 01:52:50 UTC 2003

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

Log Message:
resolve conflicts (mainly RCSIDs)


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 othersrc/libexec/tnftpd/src/cmds.c \
    othersrc/libexec/tnftpd/src/extern.h
cvs rdiff -r1.6 -r1.7 othersrc/libexec/tnftpd/src/ftpcmd.y \
    othersrc/libexec/tnftpd/src/ftpd.c
cvs rdiff -r1.2 -r1.3 othersrc/libexec/tnftpd/src/ftpd.8 \
    othersrc/libexec/tnftpd/src/ftpd.conf.5 \
    othersrc/libexec/tnftpd/src/ftpusers.5 \
    othersrc/libexec/tnftpd/src/pathnames.h
cvs rdiff -r1.3 -r1.4 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.