Module Name: src Committed By: tron Date: Sat Nov 27 10:41:18 UTC 2010
Modified Files: src/external/ibm-public/postfix/dist/html: postconf.5.html 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/global: mail_params.h src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/html/postconf.5.html cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/man/man5/postconf.5 cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/proto/postconf.proto cvs rdiff -u -r1.4 -r1.5 \ src/external/ibm-public/postfix/dist/src/global/mail_params.h cvs rdiff -u -r1.4 -r1.5 \ src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.