Module Name:	src
Committed By:	perry
Date:		Sat Mar  8 19:44:02 UTC 2003

Modified Files:
	src/gnu/dist/postfix: makedefs
	src/gnu/dist/postfix/README_FILES: RELEASE_NOTES
	src/gnu/dist/postfix/conf: main.cf master.cf post-install
	    sample-local.cf sample-misc.cf sample-pcre-body.cf
	    sample-pcre-header.cf sample-regexp-body.cf sample-regexp-header.cf
	    sample-smtpd.cf
	src/gnu/dist/postfix/src/global: Makefile.in mail_params.h
	    tok822_parse.c
	src/gnu/dist/postfix/src/master: master_ent.c
	src/gnu/dist/postfix/src/qmgr: qmgr_message.c
	src/gnu/dist/postfix/src/smtp: smtp_connect.c
	src/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_check.c
	src/gnu/dist/postfix/src/util: Makefile.in

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/makedefs
cvs rdiff -r1.1 -r1.2 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/conf/main.cf
cvs rdiff -r1.2 -r1.3 src/gnu/dist/postfix/conf/master.cf \
    src/gnu/dist/postfix/conf/sample-local.cf \
    src/gnu/dist/postfix/conf/sample-misc.cf \
    src/gnu/dist/postfix/conf/sample-pcre-body.cf \
    src/gnu/dist/postfix/conf/sample-pcre-header.cf \
    src/gnu/dist/postfix/conf/sample-regexp-body.cf \
    src/gnu/dist/postfix/conf/sample-regexp-header.cf \
    src/gnu/dist/postfix/conf/sample-smtpd.cf
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/conf/post-install
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/global/Makefile.in \
    src/gnu/dist/postfix/src/global/tok822_parse.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/master/master_ent.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/qmgr/qmgr_message.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/smtp/smtp_connect.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/src/smtpd/smtpd_check.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/util/Makefile.in

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