Module Name: src
Committed By: tron
Date: Thu Jun 17 18:18:16 UTC 2010
Modified Files:
src/external/ibm-public/postfix/dist/README_FILES:
ADDRESS_VERIFICATION_README TLS_README
src/external/ibm-public/postfix/dist/conf: master.cf
src/external/ibm-public/postfix/dist/html:
ADDRESS_VERIFICATION_README.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 TLS_README.html postconf.proto
src/external/ibm-public/postfix/dist/src/cleanup: cleanup.c cleanup.h
cleanup_envelope.c cleanup_init.c
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/tls: tls_client.c tls_server.c
src/external/ibm-public/postfix/dist/src/util: inet_addr_local.c
unix_recv_fd.c unix_send_fd.c
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README \
src/external/ibm-public/postfix/dist/README_FILES/TLS_README
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/dist/conf/master.cf
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/html/ADDRESS_VERIFICATION_README.html \
src/external/ibm-public/postfix/dist/html/TLS_README.html
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/proto/ADDRESS_VERIFICATION_README.html
\
src/external/ibm-public/postfix/dist/proto/TLS_README.html
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/dist/proto/postconf.proto
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/src/cleanup/cleanup.c \
src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h \
src/external/ibm-public/postfix/dist/src/cleanup/cleanup_envelope.c \
src/external/ibm-public/postfix/dist/src/cleanup/cleanup_init.c
cvs rdiff -u -r1.3 -r1.4 \
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/smtp/smtp.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/src/tls/tls_client.c \
src/external/ibm-public/postfix/dist/src/tls/tls_server.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/src/util/inet_addr_local.c \
src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c \
src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
