cvs commit: src/include - Imported sources

[Hajimu UMEMOTO]

ume         2006-03-21 15:57:59 UTC

  FreeBSD src repository

  src/include - Imported sources
  Update of /home/ncvs/src/include
  In directory repoman.freebsd.org:/tmp/cvs-serv56674
  
  Log Message:
  Vendor import of BIND 9.3.2
  
  Status:
  
  Vendor Tag:	ISC
  Release Tags:	BIND_9_3_2
  		
  C src/include/resolv.h
  C src/include/arpa/nameser.h
  C src/include/arpa/inet.h
  C src/include/arpa/nameser_compat.h
  
  4 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jISC:yesterday -jISC src/include