1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-24 11:29:10 +00:00
Commit Graph

18 Commits

Author SHA1 Message Date
Doug Barton
3329c8935f Resolve conflicts in 8.3.6, generally in favor of the vendor code 2003-06-17 08:32:40 +00:00
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
93841e4d67 This commit was generated by cvs2svn to compensate for changes in r71756,
which included commits to RCS files with non-trunk default branches.
2001-01-28 23:00:22 +00:00
Jeroen Ruigrok van der Werven
98ff752a5e Virgin import of BIND v8.2.3-REL 2001-01-28 23:00:22 +00:00
Jeroen Ruigrok van der Werven
bc3a71005f Resolve conflicts. 2000-10-31 12:38:22 +00:00
Jeroen Ruigrok van der Werven
0fa5b6b1ab Virgin import of BIND v8.2.3-T6B 2000-10-31 12:35:45 +00:00
Jeroen Ruigrok van der Werven
054caa0371 This commit was generated by cvs2svn to compensate for changes in r68068,
which included commits to RCS files with non-trunk default branches.
2000-10-31 12:35:45 +00:00
Jeroen Ruigrok van der Werven
a63f91247a Resolve conflicts. 2000-05-26 07:24:14 +00:00
Jeroen Ruigrok van der Werven
a1f80258eb Virgin import of BIND v8.2.3-T5B 2000-05-26 07:17:19 +00:00
Peter Wemm
c91c657ae2 Merge changes from vendor branch onto HEAD. 1999-11-30 02:52:56 +00:00
Peter Wemm
6b6ac9438f Import bind v8.2.2.p5, minus the crypto for the time being. The bind
package does have BXA export approval, but the licensing strings on the
dnssafe code are a bit unpleasant.  The crypto is easy to restore and bind
will run without it - just without full dnssec support.

Obtained from:	The Internet Software Consortium (www.isc.org)
1999-11-30 02:43:11 +00:00
Peter Wemm
4485638716 This commit was generated by cvs2svn to compensate for changes in r53910,
which included commits to RCS files with non-trunk default branches.
1999-11-30 02:43:11 +00:00
Bruce Evans
bb6ae0a4a9 Fixed printf format errors. 1998-08-02 16:44:18 +00:00
Peter Wemm
15f7f56992 Import final bind-8.1.2 release.
Obtained from: ftp.isc.org
1998-06-11 05:01:49 +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