Peter Wemm
|
34d59b1442
|
Round 1 of the conflict merge. It now compiles..
|
1996-01-07 05:48:49 +00:00 |
|
Peter Wemm
|
820a9e2403
|
Fold in conflict related changes after beta26 merge.
Also, update the man pages - they were very old and out of date.
|
1995-10-23 11:11:58 +00:00 |
|
Peter Wemm
|
ac8318a368
|
Merge in delta from 4.9.3.b9 -> 4.9.3.b24.
Much of the "-j" merge was clean, except for $Id$ and other trivial changes.
|
1995-08-20 21:19:18 +00:00 |
|
Rodney W. Grimes
|
709e8f9ae1
|
Remove trailing whitespace.
|
1995-05-30 03:57:47 +00:00 |
|
Paul Traina
|
735b43167c
|
NAMED from BIND 4.9.3 BETA9 pl1 (no local changes)
|
1994-09-22 19:46:15 +00:00 |
|