]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 17 Sep 2005 04:46:44 +0000 (00:46 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 17 Sep 2005 04:46:44 +0000 (00:46 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 432b9fb4I4cP0Ul0rwhNnz7V6KjZcA

1  2 
include/ntpd.h

diff --cc include/ntpd.h
Simple merge