CVS commit: src/gnu/dist/postfix/src/cleanup

[Rui Paulo <rpaulo%netbsd.org@localhost>]

Module Name:    src
Committed By:   rpaulo
Date:           Thu Aug 18 22:00:23 UTC 2005

Modified Files:
        src/gnu/dist/postfix/src/cleanup: cleanup.c cleanup.h
            cleanup_envelope.c cleanup_init.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/cleanup/cleanup.c \
    src/gnu/dist/postfix/src/cleanup/cleanup_envelope.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/cleanup/cleanup.h \
    src/gnu/dist/postfix/src/cleanup/cleanup_init.c

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