CVS commit: src/external/ibm-public/postfix/dist

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    src
Committed By:   tron
Date:           Sat Sep 12 08:23:24 UTC 2015

Modified Files:
        src/external/ibm-public/postfix/dist: makedefs
        src/external/ibm-public/postfix/dist/README_FILES: TLS_README
        src/external/ibm-public/postfix/dist/html: TLS_README.html
            postconf.5.html
        src/external/ibm-public/postfix/dist/man/man5: postconf.5
        src/external/ibm-public/postfix/dist/proto: TLS_README.html
            postconf.proto
        src/external/ibm-public/postfix/dist/src/global: mail_params.h
        src/external/ibm-public/postfix/dist/src/smtp: smtp.c
        src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c
        src/external/ibm-public/postfix/dist/src/util: sys_defs.h

Log Message:
Resolve conflicts from last import


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.9 -r1.10 \
    src/external/ibm-public/postfix/dist/README_FILES/TLS_README
cvs rdiff -u -r1.10 -r1.11 \
    src/external/ibm-public/postfix/dist/html/TLS_README.html
cvs rdiff -u -r1.13 -r1.14 \
    src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.13 -r1.14 \
    src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.9 -r1.10 \
    src/external/ibm-public/postfix/dist/proto/TLS_README.html
cvs rdiff -u -r1.13 -r1.14 \
    src/external/ibm-public/postfix/dist/proto/postconf.proto
cvs rdiff -u -r1.12 -r1.13 \
    src/external/ibm-public/postfix/dist/src/global/mail_params.h
cvs rdiff -u -r1.8 -r1.9 src/external/ibm-public/postfix/dist/src/smtp/smtp.c
cvs rdiff -u -r1.12 -r1.13 \
    src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
cvs rdiff -u -r1.7 -r1.8 \
    src/external/ibm-public/postfix/dist/src/util/sys_defs.h

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