Module Name:	gnusrc
Committed By:	perry
Date:		Sat Feb  2 23:54:38 UTC 2002

Modified Files:
	gnusrc/gnu/dist/postfix: makedefs
	gnusrc/gnu/dist/postfix/src/global: Makefile.in resolve_local.c
	    tok822_parse.c
	gnusrc/gnu/dist/postfix/src/master: master.h master_ent.c
	    master_listen.c
	gnusrc/gnu/dist/postfix/src/qmgr: qmgr_message.c
	gnusrc/gnu/dist/postfix/src/smtp: smtp_addr.c
	gnusrc/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_check.c smtpd_peer.c
	gnusrc/gnu/dist/postfix/src/util: Makefile.in match_list.c match_ops.c
	    sys_defs.h

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/postfix/makedefs
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/postfix/src/global/Makefile.in \
    gnusrc/gnu/dist/postfix/src/global/resolve_local.c \
    gnusrc/gnu/dist/postfix/src/global/tok822_parse.c
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/postfix/src/master/master.h
cvs rdiff -r1.7 -r1.8 gnusrc/gnu/dist/postfix/src/master/master_ent.c
cvs rdiff -r1.5 -r1.6 gnusrc/gnu/dist/postfix/src/master/master_listen.c
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/postfix/src/qmgr/qmgr_message.c
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/postfix/src/smtp/smtp_addr.c
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.7 -r1.8 gnusrc/gnu/dist/postfix/src/smtpd/smtpd_check.c
cvs rdiff -r1.8 -r1.9 gnusrc/gnu/dist/postfix/src/smtpd/smtpd_peer.c
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/postfix/src/util/Makefile.in \
    gnusrc/gnu/dist/postfix/src/util/sys_defs.h
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/postfix/src/util/match_list.c \
    gnusrc/gnu/dist/postfix/src/util/match_ops.c

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