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

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

Module Name:    src
Committed By:   rpaulo
Date:           Thu Aug 18 22:11:17 UTC 2005

Modified Files:
        src/gnu/dist/postfix/src/util: Makefile.in inet_addr_host.c
            inet_addr_list.c inet_addr_list.h inet_addr_local.c inet_connect.c
            inet_listen.c match_list.c match_ops.c sys_defs.h valid_hostname.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/src/util/Makefile.in
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/util/inet_addr_host.c \
    src/gnu/dist/postfix/src/util/inet_addr_list.h \
    src/gnu/dist/postfix/src/util/inet_connect.c \
    src/gnu/dist/postfix/src/util/inet_listen.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/src/util/inet_addr_list.c \
    src/gnu/dist/postfix/src/util/match_ops.c
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/src/util/inet_addr_local.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/util/match_list.c \
    src/gnu/dist/postfix/src/util/valid_hostname.c
cvs rdiff -r1.15 -r1.16 src/gnu/dist/postfix/src/util/sys_defs.h

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