Module Name: src
Committed By: tron
Date: Wed Mar 2 19:56:40 UTC 2011
Modified Files:
src/external/ibm-public/postfix/dist/README_FILES:
ADDRESS_VERIFICATION_README INSTALL TLS_README
src/external/ibm-public/postfix/dist/conf: master.cf postfix-files
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.h
src/external/ibm-public/postfix/dist/src/global: mail_params.h
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: unix_recv_fd.c
unix_send_fd.c
Removed Files:
src/external/ibm-public/postfix/dist/src/util: upass_connect.c
upass_listen.c upass_trigger.c
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README \
src/external/ibm-public/postfix/dist/README_FILES/TLS_README
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/README_FILES/INSTALL
cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/dist/conf/master.cf
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/conf/postfix-files
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/html/ADDRESS_VERIFICATION_README.html \
src/external/ibm-public/postfix/dist/html/TLS_README.html
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/html/INSTALL.html
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/html/postconf.5.html
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/man/man5/postconf.5
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/proto/ADDRESS_VERIFICATION_README.html
\
src/external/ibm-public/postfix/dist/proto/TLS_README.html
cvs rdiff -u -r1.2 -r1.3 \
src/external/ibm-public/postfix/dist/proto/INSTALL.html
cvs rdiff -u -r1.6 -r1.7 \
src/external/ibm-public/postfix/dist/proto/postconf.proto
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/src/cleanup/cleanup.h
cvs rdiff -u -r1.5 -r1.6 \
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/smtp/smtp.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/src/tls/tls_client.c \
src/external/ibm-public/postfix/dist/src/tls/tls_server.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c \
src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/ibm-public/postfix/dist/src/util/upass_connect.c \
src/external/ibm-public/postfix/dist/src/util/upass_trigger.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/ibm-public/postfix/dist/src/util/upass_listen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
