Module Name:	src
Committed By:	rpaulo
Date:		Sat Feb 25 22:17:12 UTC 2006

Modified Files:
	src/gnu/dist/postfix: postfix2netbsd
	src/gnu/dist/postfix/man/man5: postconf.5
	src/gnu/dist/postfix/src/dns: dns_lookup.c
	src/gnu/dist/postfix/src/global: mail_params.h
	src/gnu/dist/postfix/src/qmgr: qmgr_message.c
	src/gnu/dist/postfix/src/smtp: smtp_addr.c smtp_connect.c
	src/gnu/dist/postfix/src/smtpd: smtpd_check.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/postfix2netbsd
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/man/man5/postconf.5
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/src/dns/dns_lookup.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.13 -r1.14 src/gnu/dist/postfix/src/qmgr/qmgr_message.c
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/src/smtp/smtp_addr.c
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/src/smtp/smtp_connect.c
cvs rdiff -r1.18 -r1.19 src/gnu/dist/postfix/src/smtpd/smtpd_check.c

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