]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Thu, 16 Feb 2006 08:55:22 +0000 (03:55 -0500)
committerHarlan Stenn <stenn@ntp.org>
Thu, 16 Feb 2006 08:55:22 +0000 (03:55 -0500)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 43f43dfaGYvCkubKce_UPFP_qIk6aQ

1  2 
ntpd/ntpsim.c

diff --cc ntpd/ntpsim.c
Simple merge