mrg
Sun Apr 13 02:12:20 PDT 1997
Update of /cvsroot/src/lib/libc/net
In directory netbsd1:/var/slash-tmp/cvs-serv3593

Log Message:
BIND 4.9.5-P1 resolver bits we use

Status:

Vendor Tag:	ISC
Release Tags:	v4_9_5_P1
		
C src/lib/libc/net/res_send.c
C src/lib/libc/net/res_query.c
C src/lib/libc/net/res_mkquery.c
C src/lib/libc/net/res_init.c
C src/lib/libc/net/res_debug.c
C src/lib/libc/net/res_comp.c
C src/lib/libc/net/nsap_addr.c
C src/lib/libc/net/inet_addr.c
C src/lib/libc/net/herror.c
C src/lib/libc/net/getnetent.c
C src/lib/libc/net/getnetbyaddr.c
N src/lib/libc/net/res_data.c
N src/lib/libc/net/inet_pton.c
N src/lib/libc/net/inet_ntop.c
N src/lib/libc/net/inet_neta.c
N src/lib/libc/net/inet_net_pton.c
N src/lib/libc/net/inet_net_ntop.c
C src/lib/libc/net/sethostent.c
N src/lib/libc/net/base64.c
C src/lib/libc/net/gethostnamadr.c

13 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jISC:yesterday -jISC src/lib/libc/net


mrg
Sun Apr 13 02:14:39 PDT 1997
Update of /cvsroot/src/include
In directory netbsd1:/var/slash-tmp/cvs-serv4473

Log Message:
BIND 4.9.5-P1 include bits

Status:

Vendor Tag:	ISC
Release Tags:	v4_9_5_P1
		
C src/include/resolv.h
C src/include/netdb.h
C src/include/arpa/inet.h
C src/include/arpa/nameser.h

4 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jISC:yesterday -jISC src/include