]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge ssh://kamboj@pogo.udel.edu/new-config-bk-repo
authorSachin Kamboj <kamboj@cis.udel.edu>
Tue, 16 Jan 2007 07:23:37 +0000 (02:23 -0500)
committerSachin Kamboj <kamboj@cis.udel.edu>
Tue, 16 Jan 2007 07:23:37 +0000 (02:23 -0500)
into  ferrari.local:/Users/skamboj/Documents/Research/NTP/new-config-bk-repo

bk: 45ac7d79fQnTI-hmQht7ecHx6mPpuA

1  2 
ntpd/ntp_control.c

Simple merge