Subject: CVS commit: src/gnu/dist/postfix/src/smtpd
To: None <source-changes@netbsd.org>
From: Perry E. Metzger <perry@netbsd.org>
List: source-changes
Date: 12/24/2002 22:47:06
Module Name:	src
Committed By:	perry
Date:		Tue Dec 24 20:47:06 UTC 2002

Modified Files:
	src/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_check.c smtpd_peer.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/src/smtpd/smtpd_check.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/smtpd/smtpd_peer.c

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