3 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
agc	865595bdf3	Move UCB-licensed code from 4-clause to 3-clause licence. ... Patches provided by Joel Baker in PR 22253, verified by myself.	2003-08-07 09:20:39 +00:00
simonb	4ba759c886	Import ntp 4.0.99g	2000-03-29 12:38:44 +00:00