Module Name: src
Committed By: tron
Date: Wed Mar 23 19:10:45 UTC 2011
Modified Files:
src/external/ibm-public/postfix/dist: makedefs
src/external/ibm-public/postfix/dist/src/global: mail_params.h
Log Message:
Resolve conflict from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/src/global/mail_params.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
