CVS commit: src/gnu/dist/postfix

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sat Aug 30 10:54:27 UTC 2008

Modified Files:
        src/gnu/dist/postfix: RELEASE_NOTES
        src/gnu/dist/postfix/html: postconf.5.html
        src/gnu/dist/postfix/man/man5: postconf.5
        src/gnu/dist/postfix/man/man8: local.8
        src/gnu/dist/postfix/proto: postconf.proto
        src/gnu/dist/postfix/src/global: mail_params.h
        src/gnu/dist/postfix/src/smtpd: smtpd.c
        src/gnu/dist/postfix/src/util: match_ops.c vstream_tweak.c
Removed Files:
        src/gnu/dist/postfix: INSTALL
        src/gnu/dist/postfix/README_FILES: RELEASE_NOTES
        src/gnu/dist/postfix/conf: LICENSE TLS_LICENSE

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r0 src/gnu/dist/postfix/INSTALL
cvs rdiff -r1.2 -r1.3 src/gnu/dist/postfix/RELEASE_NOTES
cvs rdiff -r1.14 -r0 src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/conf/LICENSE \
    src/gnu/dist/postfix/conf/TLS_LICENSE
cvs rdiff -r1.2 -r1.3 src/gnu/dist/postfix/html/postconf.5.html
cvs rdiff -r1.15 -r1.16 src/gnu/dist/postfix/man/man5/postconf.5
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/man/man8/local.8
cvs rdiff -r1.2 -r1.3 src/gnu/dist/postfix/proto/postconf.proto
cvs rdiff -r1.17 -r1.18 src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.22 -r1.23 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/util/match_ops.c
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/src/util/vstream_tweak.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.