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

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

Module Name:    src
Committed By:   tron
Date:           Sun Jul  6 19:45:51 UTC 2014

Modified Files:
        src/external/ibm-public/postfix/dist: makedefs
        src/external/ibm-public/postfix/dist/README_FILES:
            ADDRESS_VERIFICATION_README INSTALL TLS_README
        src/external/ibm-public/postfix/dist/conf: main.cf master.cf
            postfix-files
        src/external/ibm-public/postfix/dist/html:
            ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html
            postconf.5.html
        src/external/ibm-public/postfix/dist/man/man5: postconf.5
        src/external/ibm-public/postfix/dist/proto:
            ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html
            postconf.proto
        src/external/ibm-public/postfix/dist/src/cleanup: cleanup.h
        src/external/ibm-public/postfix/dist/src/dns: dns_lookup.c
        src/external/ibm-public/postfix/dist/src/global: mail_params.h
        src/external/ibm-public/postfix/dist/src/postconf: postconf_master.c
        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/tls: tls_client.c tls_server.c
        src/external/ibm-public/postfix/dist/src/util: dict_sockmap.c
            sys_defs.h
Removed Files:
        src/external/ibm-public/postfix/dist/src/util: read_wait.c readable.c
            writable.c write_wait.c

Log Message:
Resolve conflicts from last import.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.6 -r1.7 \
    
src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README
cvs rdiff -u -r1.5 -r1.6 \
    src/external/ibm-public/postfix/dist/README_FILES/INSTALL
cvs rdiff -u -r1.8 -r1.9 \
    src/external/ibm-public/postfix/dist/README_FILES/TLS_README
cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/dist/conf/main.cf \
    src/external/ibm-public/postfix/dist/conf/postfix-files
cvs rdiff -u -r1.6 -r1.7 src/external/ibm-public/postfix/dist/conf/master.cf
cvs rdiff -u -r1.6 -r1.7 \
    src/external/ibm-public/postfix/dist/html/ADDRESS_VERIFICATION_README.html
cvs rdiff -u -r1.5 -r1.6 \
    src/external/ibm-public/postfix/dist/html/INSTALL.html
cvs rdiff -u -r1.9 -r1.10 \
    src/external/ibm-public/postfix/dist/html/TLS_README.html
cvs rdiff -u -r1.12 -r1.13 \
    src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.12 -r1.13 \
    src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.6 -r1.7 \
    src/external/ibm-public/postfix/dist/proto/ADDRESS_VERIFICATION_README.html
cvs rdiff -u -r1.5 -r1.6 \
    src/external/ibm-public/postfix/dist/proto/INSTALL.html
cvs rdiff -u -r1.8 -r1.9 \
    src/external/ibm-public/postfix/dist/proto/TLS_README.html
cvs rdiff -u -r1.12 -r1.13 \
    src/external/ibm-public/postfix/dist/proto/postconf.proto
cvs rdiff -u -r1.5 -r1.6 \
    src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/src/dns/dns_lookup.c
cvs rdiff -u -r1.11 -r1.12 \
    src/external/ibm-public/postfix/dist/src/global/mail_params.h
cvs rdiff -u -r1.2 -r1.3 \
    src/external/ibm-public/postfix/dist/src/postconf/postconf_master.c
cvs rdiff -u -r1.7 -r1.8 src/external/ibm-public/postfix/dist/src/smtp/smtp.c
cvs rdiff -u -r1.10 -r1.11 \
    src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
cvs rdiff -u -r1.8 -r1.9 \
    src/external/ibm-public/postfix/dist/src/tls/tls_client.c
cvs rdiff -u -r1.7 -r1.8 \
    src/external/ibm-public/postfix/dist/src/tls/tls_server.c
cvs rdiff -u -r1.3 -r1.4 \
    src/external/ibm-public/postfix/dist/src/util/dict_sockmap.c
cvs rdiff -u -r1.1.1.2 -r0 \
    src/external/ibm-public/postfix/dist/src/util/read_wait.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/external/ibm-public/postfix/dist/src/util/readable.c \
    src/external/ibm-public/postfix/dist/src/util/writable.c \
    src/external/ibm-public/postfix/dist/src/util/write_wait.c
cvs rdiff -u -r1.6 -r1.7 \
    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.