]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn
authorJohannes Maximilian Kuehn <kuehn@ntp.org>
Sun, 27 Jul 2008 19:40:43 +0000 (19:40 +0000)
committerJohannes Maximilian Kuehn <kuehn@ntp.org>
Sun, 27 Jul 2008 19:40:43 +0000 (19:40 +0000)
into  pogo.udel.edu:/pogo/users/kuehn/repo/ntp-dev

bk: 488ccf3bD-j9n8cmegN0uwlLdyyRpA

1  2 
gsoc_sntp/sntp-opts.def

Simple merge