Module Name: src
Committed By: tron
Date: Wed Sep 25 19:12:35 UTC 2013
Modified Files:
src/external/ibm-public/postfix/dist: makedefs postfix-install
src/external/ibm-public/postfix/dist/README_FILES:
ADDRESS_VERIFICATION_README INSTALL TLS_README
src/external/ibm-public/postfix/dist/conf: master.cf
src/external/ibm-public/postfix/dist/html:
ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html
postconf.5.html
src/external/ibm-public/postfix/dist/man/man5: postconf.5
src/external/ibm-public/postfix/dist/proto:
ADDRESS_VERIFICATION_README.html INSTALL.html TLS_README.html
postconf.proto
src/external/ibm-public/postfix/dist/src/cleanup: cleanup.c
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
src/external/ibm-public/postfix/dist/src/util: sys_defs.h
Removed Files:
src/external/ibm-public/postfix/dist/src/bounce: annotate.pl
src/external/ibm-public/postfix/dist/src/util: stream_pass_connect.c
unix_pass_listen.c unix_pass_trigger.c
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/ibm-public/postfix/dist/makedefs
cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/dist/postfix-install
cvs rdiff -u -r1.5 -r1.6 \
src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/dist/README_FILES/INSTALL
cvs rdiff -u -r1.7 -r1.8 \
src/external/ibm-public/postfix/dist/README_FILES/TLS_README
cvs rdiff -u -r1.5 -r1.6 src/external/ibm-public/postfix/dist/conf/master.cf
cvs rdiff -u -r1.5 -r1.6 \
src/external/ibm-public/postfix/dist/html/ADDRESS_VERIFICATION_README.html
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/dist/html/INSTALL.html
cvs rdiff -u -r1.8 -r1.9 \
src/external/ibm-public/postfix/dist/html/TLS_README.html
cvs rdiff -u -r1.11 -r1.12 \
src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.11 -r1.12 \
src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.5 -r1.6 \
src/external/ibm-public/postfix/dist/proto/ADDRESS_VERIFICATION_README.html
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/dist/proto/INSTALL.html
cvs rdiff -u -r1.7 -r1.8 \
src/external/ibm-public/postfix/dist/proto/TLS_README.html
cvs rdiff -u -r1.11 -r1.12 \
src/external/ibm-public/postfix/dist/proto/postconf.proto
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/ibm-public/postfix/dist/src/bounce/annotate.pl
cvs rdiff -u -r1.4 -r1.5 \
src/external/ibm-public/postfix/dist/src/cleanup/cleanup.c
cvs rdiff -u -r1.10 -r1.11 \
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/local/unknown.c
cvs rdiff -u -r1.6 -r1.7 src/external/ibm-public/postfix/dist/src/smtp/smtp.c
cvs rdiff -u -r1.9 -r1.10 \
src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/ibm-public/postfix/dist/src/tls/tls_client.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/src/tls/tls_server.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/ibm-public/postfix/dist/src/util/stream_pass_connect.c \
src/external/ibm-public/postfix/dist/src/util/unix_pass_listen.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/ibm-public/postfix/dist/src/util/sys_defs.h
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/ibm-public/postfix/dist/src/util/unix_pass_trigger.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
