Module Name: src
Committed By: tron
Date: Sat Apr 17 10:29: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 caused by import of Postfix 2.6.6.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/proto/postconf.proto
cvs rdiff -u -r1.2 -r1.3 \
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/smtpd/smtpd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
