Module Name:	src
Committed By:	rpaulo
Date:		Thu Aug 18 22:04:55 UTC 2005

Modified Files:
	src/gnu/dist/postfix/src/global: Makefile.in mail_params.h mynetworks.c
	    own_inet_addr.c own_inet_addr.h resolve_local.c
Added Files:
	src/gnu/dist/postfix/src/global: wildcard_inet_addr.c
	    wildcard_inet_addr.h

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/global/Makefile.in
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/global/mynetworks.c \
    src/gnu/dist/postfix/src/global/own_inet_addr.h
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/global/own_inet_addr.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/global/resolve_local.c
cvs rdiff -r0 -r1.3 src/gnu/dist/postfix/src/global/wildcard_inet_addr.c \
    src/gnu/dist/postfix/src/global/wildcard_inet_addr.h

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