Commit Graph

14 Commits

Author SHA1 Message Date
mellon e59a2459c4 Merge 3.0b2pl2 with head. 2000-09-04 23:19:27 +00:00
jwise b240da3ec1 Fix circular reference. Instead of cross referencing itself, dhcpd.conf(5)
now cross-references dhcpd(8).
2000-08-02 18:23:44 +00:00
mellon 4b564fe2bf Merge 20000719 changes 2000-07-20 05:59:17 +00:00
mellon d1340e80d6 Fix conflicts in latest import. 2000-07-08 20:52:11 +00:00
mellon 582a2367ec Fix conflicts in merge. 2000-06-10 18:17:18 +00:00
mellon e04a818808 Initial merge of ISC DHCP 3.0 into NetBSD tree (incomplete) 2000-04-22 08:18:11 +00:00
mellon 177a06d1a4 Resolve conflicts from Patchlevel 25 import. 1999-04-09 17:55:01 +00:00
mellon 7ccf21d94d Fix conflicts in merge. 1999-03-26 17:52:45 +00:00
mellon e7b0bff792 Resolve conflicts in 2.0b1pl15 1999-02-24 04:14:34 +00:00
mellon 2b8be45751 Resolve conflicts in 2.0b1pl13 import 1999-02-18 22:04:06 +00:00
kleink c039c662a2 GMT -> UTC 1998-09-10 19:30:37 +00:00
mellon eab517a1d1 ISC DHCP Snapshot on November 22, 1997 1997-11-22 09:13:21 +00:00
mellon 185e701358 970602 snapshot 1997-06-03 02:49:04 +00:00
mellon f5aacd55fe March 29 snapshot 1997-03-29 21:52:15 +00:00