CVS commit: src/lib/libc

[Geert Hendrickx <ghen%netbsd.org@localhost>]

Module Name:    src
Committed By:   ghen
Date:           Fri Mar 30 20:23:05 UTC 2007

Modified Files:
        src/lib/libc/include/isc: list.h
        src/lib/libc/inet: inet_cidr_ntop.c inet_cidr_pton.c inet_ntop.c
            inet_pton.c nsap_addr.c
        src/lib/libc/isc: assertions.c ev_streams.c ev_timers.c
        src/lib/libc/nameser: ns_name.c ns_netint.c ns_parse.c ns_print.c
            ns_samedomain.c ns_ttl.c
        src/lib/libc/net: base64.c
        src/lib/libc/resolv: herror.c res_comp.c res_data.c res_debug.c
            res_init.c res_mkquery.c res_query.c res_send.c
Removed Files:
        src/lib/libc/resolv: mtctxres.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/lib/libc/include/isc/list.h
cvs rdiff -r1.4 -r1.5 src/lib/libc/inet/inet_cidr_ntop.c \
    src/lib/libc/inet/inet_ntop.c src/lib/libc/inet/inet_pton.c
cvs rdiff -r1.3 -r1.4 src/lib/libc/inet/inet_cidr_pton.c \
    src/lib/libc/inet/nsap_addr.c
cvs rdiff -r1.3 -r1.4 src/lib/libc/isc/assertions.c \
    src/lib/libc/isc/ev_streams.c
cvs rdiff -r1.4 -r1.5 src/lib/libc/isc/ev_timers.c
cvs rdiff -r1.4 -r1.5 src/lib/libc/nameser/ns_name.c \
    src/lib/libc/nameser/ns_parse.c src/lib/libc/nameser/ns_ttl.c
cvs rdiff -r1.3 -r1.4 src/lib/libc/nameser/ns_netint.c \
    src/lib/libc/nameser/ns_samedomain.c
cvs rdiff -r1.6 -r1.7 src/lib/libc/nameser/ns_print.c
cvs rdiff -r1.9 -r1.10 src/lib/libc/net/base64.c
cvs rdiff -r1.5 -r1.6 src/lib/libc/resolv/herror.c
cvs rdiff -r1.2 -r0 src/lib/libc/resolv/mtctxres.c
cvs rdiff -r1.7 -r1.8 src/lib/libc/resolv/res_comp.c \
    src/lib/libc/resolv/res_mkquery.c
cvs rdiff -r1.9 -r1.10 src/lib/libc/resolv/res_data.c
cvs rdiff -r1.8 -r1.9 src/lib/libc/resolv/res_debug.c \
    src/lib/libc/resolv/res_query.c
cvs rdiff -r1.12 -r1.13 src/lib/libc/resolv/res_init.c \
    src/lib/libc/resolv/res_send.c

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