4 Commits

Author	SHA1	Message	Date
drochner	d5e6f1b80b	resolve conflicts ... (in this case, throw away all local modifications; I'll start patching from scratch)	2003-12-04 16:23:34 +00:00
simonb	0eed315b53	Resolve conflicts.	2000-04-22 15:04:49 +00:00
simonb	7d3a90fdd4	Move loadservers() prototype to a header file, so other files can see ... that prototype.	2000-04-17 05:49:54 +00:00
simonb	4ba759c886	Import ntp 4.0.99g	2000-03-29 12:38:44 +00:00