Module Name: src Committed By: christos Date: Mon May 25 23:47:14 UTC 2020
Modified Files: src/external/ibm-public/postfix/dist: makedefs src/external/ibm-public/postfix/dist/html: postconf.5.html src/external/ibm-public/postfix/dist/man/man1: postfix.1 src/external/ibm-public/postfix/dist/man/man5: postconf.5 src/external/ibm-public/postfix/dist/proto: postconf.proto src/external/ibm-public/postfix/dist/src/dns: dns.h dns_lookup.c src/external/ibm-public/postfix/dist/src/global: mail_params.c mail_params.h mail_version.h src/external/ibm-public/postfix/dist/src/milter: milter.c src/external/ibm-public/postfix/dist/src/postfix: postfix.c src/external/ibm-public/postfix/dist/src/smtpd: smtpd_check.c src/external/ibm-public/postfix/dist/src/tls: tls_session.c src/external/ibm-public/postfix/dist/src/tlsproxy: tlsproxy.c src/external/ibm-public/postfix/dist/src/util: midna_domain.c midna_domain.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/ibm-public/postfix/dist/makedefs cvs rdiff -u -r1.16 -r1.17 \ src/external/ibm-public/postfix/dist/html/postconf.5.html cvs rdiff -u -r1.3 -r1.4 \ src/external/ibm-public/postfix/dist/man/man1/postfix.1 cvs rdiff -u -r1.16 -r1.17 \ src/external/ibm-public/postfix/dist/man/man5/postconf.5 cvs rdiff -u -r1.16 -r1.17 \ src/external/ibm-public/postfix/dist/proto/postconf.proto cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/dist/src/dns/dns.h cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/src/dns/dns_lookup.c cvs rdiff -u -r1.3 -r1.4 \ src/external/ibm-public/postfix/dist/src/global/mail_params.c \ src/external/ibm-public/postfix/dist/src/global/mail_version.h cvs rdiff -u -r1.16 -r1.17 \ src/external/ibm-public/postfix/dist/src/global/mail_params.h cvs rdiff -u -r1.3 -r1.4 \ src/external/ibm-public/postfix/dist/src/milter/milter.c cvs rdiff -u -r1.3 -r1.4 \ src/external/ibm-public/postfix/dist/src/postfix/postfix.c cvs rdiff -u -r1.3 -r1.4 \ src/external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c cvs rdiff -u -r1.2 -r1.3 \ src/external/ibm-public/postfix/dist/src/tls/tls_session.c cvs rdiff -u -r1.3 -r1.4 \ src/external/ibm-public/postfix/dist/src/tlsproxy/tlsproxy.c cvs rdiff -u -r1.3 -r1.4 \ src/external/ibm-public/postfix/dist/src/util/midna_domain.c \ src/external/ibm-public/postfix/dist/src/util/midna_domain.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.