]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c15618c 6aa1a04)
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1520
authorDave Hart <hart@ntp.org>
Sat, 10 Apr 2010 03:30:30 +0000 (03:30 +0000)
committerDave Hart <hart@ntp.org>
Sat, 10 Apr 2010 03:30:30 +0000 (03:30 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518-20-22

bk: 4bbff0d6EhrLMUQgmzbKngffrl24tQ

1  2 
ntpd/ntp_config.c patch | diff1 | diff2 | blob | history

diff --cc ntpd/ntp_config.c
Simple merge
Mirror of https://github.com/ntp-project/ntp.git