mrg
Sat Jul 19 21:07:45 PDT 1997
Update of /cvsroot/src/lib/libc/net
In directory netbsd1:/var/slash-tmp/cvs-serv15042

Log Message:
bind 4.9.6 resolver files.

Status:

Vendor Tag:	ISC
Release Tags:	v4_9_6
		
U src/lib/libc/net/base64.c
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_data.c
C src/lib/libc/net/res_comp.c
C src/lib/libc/net/nsap_addr.c
C src/lib/libc/net/inet_pton.c
C src/lib/libc/net/inet_ntop.c
C src/lib/libc/net/inet_neta.c
C src/lib/libc/net/inet_net_pton.c
C src/lib/libc/net/inet_net_ntop.c
C src/lib/libc/net/inet_addr.c
C src/lib/libc/net/herror.c
N src/lib/libc/net/getnetnamadr.c
C src/lib/libc/net/getnetent.c
C src/lib/libc/net/getnetbyname.c
C src/lib/libc/net/getnetbyaddr.c
N src/lib/libc/net/gethnamaddr.c
C src/lib/libc/net/sethostent.c

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

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