Module Name: src Committed By: tron Date: Sat Jun 9 11:32:20 UTC 2012
Modified Files: 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/local: unknown.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 Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/ibm-public/postfix/dist/README_FILES/TLS_README cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/html/TLS_README.html cvs rdiff -u -r1.8 -r1.9 \ src/external/ibm-public/postfix/dist/html/postconf.5.html cvs rdiff -u -r1.8 -r1.9 \ src/external/ibm-public/postfix/dist/man/man5/postconf.5 cvs rdiff -u -r1.4 -r1.5 \ src/external/ibm-public/postfix/dist/proto/TLS_README.html cvs rdiff -u -r1.8 -r1.9 \ src/external/ibm-public/postfix/dist/proto/postconf.proto cvs rdiff -u -r1.7 -r1.8 \ 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/local/unknown.c cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/dist/src/smtp/smtp.c cvs rdiff -u -r1.7 -r1.8 \ src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c cvs rdiff -u -r1.4 -r1.5 \ src/external/ibm-public/postfix/dist/src/tls/tls_client.c \ src/external/ibm-public/postfix/dist/src/tls/tls_server.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.