CVS commit: src/gnu/dist/postfix

[john heasley <heas%netbsd.org@localhost>]

Module Name:    src
Committed By:   heas
Date:           Wed Jul 28 23:19:42 UTC 2004

Modified Files:
        src/gnu/dist/postfix/README_FILES: RELEASE_NOTES
        src/gnu/dist/postfix/conf: main.cf master.cf post-install postfix-files
            postfix-script
        src/gnu/dist/postfix/src/global: mynetworks.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
        src/gnu/dist/postfix/src/util: sys_defs.h

Log Message:
Resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/conf/main.cf
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/conf/master.cf
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/conf/post-install
cvs rdiff -r1.2 -r1.3 src/gnu/dist/postfix/conf/postfix-files \
    src/gnu/dist/postfix/conf/postfix-script
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/src/global/mynetworks.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/src/qmgr/qmgr_message.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/src/smtp/smtp_connect.c
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.13 -r1.14 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.