5 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
drochner	b21928a34e	Import ntp 4.2.0	2003-12-04 16:05:14 +00:00
wiz	79deb5d12d	Comment out token after #endif.	2002-05-16 19:40:53 +00:00
simonb	355d78599e	Import ntp 4.0.99i	2000-04-22 14:51:59 +00:00
simonb	4ba759c886	Import ntp 4.0.99g	2000-03-29 12:38:44 +00:00