Module Name:	src
Committed By:	rpaulo
Date:		Wed Jul 19 01:35:40 UTC 2006

Modified Files:
	src/gnu/dist/postfix: makedefs
	src/gnu/dist/postfix/README_FILES: INSTALL RELEASE_NOTES
	src/gnu/dist/postfix/conf: main.cf master.cf post-install postfix-files
	src/gnu/dist/postfix/man/man5: canonical.5 postconf.5 virtual.5
	src/gnu/dist/postfix/man/man8: cleanup.8 lmtp.8 local.8
	src/gnu/dist/postfix/src/cleanup: cleanup.c cleanup.h
	    cleanup_envelope.c cleanup_init.c
	src/gnu/dist/postfix/src/dns: dns_lookup.c
	src/gnu/dist/postfix/src/global: Makefile.in mail_params.h mynetworks.c
	    own_inet_addr.c resolve_local.c tok822_parse.c
	src/gnu/dist/postfix/src/master: mail_flow.c master.h master_ent.c
	    master_listen.c
	src/gnu/dist/postfix/src/qmgr: qmgr_message.c
	src/gnu/dist/postfix/src/smtp: smtp_addr.c smtp_connect.c
	    smtp_unalias.c
	src/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_check.c smtpd_peer.c
	src/gnu/dist/postfix/src/tls: tls_session.c
	src/gnu/dist/postfix/src/util: Makefile.in inet_addr_host.c
	    inet_addr_list.c inet_addr_local.c match_list.c match_ops.c
	    sys_defs.h valid_hostname.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.13 -r1.14 src/gnu/dist/postfix/makedefs
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/README_FILES/INSTALL
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -r1.13 -r1.14 src/gnu/dist/postfix/conf/main.cf
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/conf/master.cf
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/conf/post-install
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/conf/postfix-files
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/man/man5/canonical.5 \
    src/gnu/dist/postfix/man/man5/postconf.5
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/man/man5/virtual.5
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/man/man8/cleanup.8 \
    src/gnu/dist/postfix/man/man8/lmtp.8 \
    src/gnu/dist/postfix/man/man8/local.8
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/cleanup/cleanup.c \
    src/gnu/dist/postfix/src/cleanup/cleanup_envelope.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/cleanup/cleanup.h \
    src/gnu/dist/postfix/src/cleanup/cleanup_init.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/src/dns/dns_lookup.c
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/src/global/Makefile.in \
    src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/global/mynetworks.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/global/own_inet_addr.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/global/resolve_local.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/global/tok822_parse.c
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/src/master/mail_flow.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/master/master.h \
    src/gnu/dist/postfix/src/master/master_listen.c
cvs rdiff -r1.13 -r1.14 src/gnu/dist/postfix/src/master/master_ent.c
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/src/qmgr/qmgr_message.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/src/smtp/smtp_addr.c
cvs rdiff -r1.15 -r1.16 src/gnu/dist/postfix/src/smtp/smtp_connect.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/smtp/smtp_unalias.c
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.19 -r1.20 src/gnu/dist/postfix/src/smtpd/smtpd_check.c
cvs rdiff -r1.13 -r1.14 src/gnu/dist/postfix/src/smtpd/smtpd_peer.c
cvs rdiff -r1.2 -r1.3 src/gnu/dist/postfix/src/tls/tls_session.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/src/util/Makefile.in
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/util/inet_addr_host.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/util/inet_addr_list.c \
    src/gnu/dist/postfix/src/util/match_ops.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/util/inet_addr_local.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/util/match_list.c \
    src/gnu/dist/postfix/src/util/valid_hostname.c
cvs rdiff -r1.18 -r1.19 src/gnu/dist/postfix/src/util/sys_defs.h

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