]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 13 Jun 2003 06:28:46 +0000 (02:28 -0400)
committerHarlan Stenn <stenn@ntp.org>
Fri, 13 Jun 2003 06:28:46 +0000 (02:28 -0400)
into whimsy.udel.edu:/backroom/ntp-dev

bk: 3ee96f1ezr6JdlSDrA8kcUaIPpMgZQ

1  2 
ntpd/ntp_intres.c

Simple merge