]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 4 Apr 2006 10:21:59 +0000 (06:21 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 4 Apr 2006 10:21:59 +0000 (06:21 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 443248c7lvVS35sBcr3KKwpbEM9XpQ

1  2 
ntpd/refclock_acts.c
ntpdc/ntpdc.c

Simple merge
diff --cc ntpdc/ntpdc.c
Simple merge