Commit Graph

9 Commits

Author SHA1 Message Date
Doug Barton
16f43f04f8 Resolve conflicts, generally in favor of the vendor version. 2002-07-01 01:20:28 +00:00
Jacques Vidrine
789fda719a Resolve conflicts after import of ISC BIND 8.3.1-REL. 2002-02-04 19:15:33 +00:00
Jeroen Ruigrok van der Werven
84f77e557e Resolve conflicts. 2001-07-30 16:55:52 +00:00
Jeroen Ruigrok van der Werven
e11258ca5f Resolve conflicts after import. 2001-01-28 23:06:48 +00:00
Jeroen Ruigrok van der Werven
bc3a71005f Resolve conflicts. 2000-10-31 12:38:22 +00:00
Jeroen Ruigrok van der Werven
a63f91247a Resolve conflicts. 2000-05-26 07:24:14 +00:00
Peter Wemm
c91c657ae2 Merge changes from vendor branch onto HEAD. 1999-11-30 02:52:56 +00:00
Bruce Evans
bb6ae0a4a9 Fixed printf format errors. 1998-08-02 16:44:18 +00:00
Peter Wemm
4e0ffe0bae Import (trimmed) ISC bind-8.1.2-t3b. This will be updated to 8.1.2 on
final release.

Obtained from:  ftp.isc.org
1998-05-03 04:11:49 +00:00