git.ipfire.org Git - thirdparty/ntp.git/commit

]> git.ipfire.org Git - thirdparty/ntp.git/commit

projects / thirdparty / ntp.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ad1f389 6a5f3e2)

author	Dave Hart <hart@ntp.org>
	Tue, 9 Aug 2011 05:22:29 +0000 (05:22 +0000)
committer	Dave Hart <hart@ntp.org>
	Tue, 9 Aug 2011 05:22:29 +0000 (05:22 +0000)
commit	f835938fb561a4f9ceef66ebfdd84eb58b66f382
tree	f20585cfc3b6b8cd35e460fc63fa5d90eb3ab0d0	tree \| snapshot
parent	ad1f3895d71bd3f10abddb596c69137eb368417b	commit \| diff
parent	6a5f3e2926b2a1d0a7dd1a82b3985b990540f90a	commit \| diff

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1984-85
into shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1984-85

bk: 4e40c415Fadz7A_s0-HRmzQKjzBn0w

ChangeLog	diff1 \|	diff2 \|	blob \| history
include/ntp_syslog.h	diff1 \|	diff2 \|	blob \| history
include/ntpd.h	diff1 \|	diff2 \|	blob \| history
libntp/machines.c	diff1 \|	diff2 \|	blob \| history
libntp/msyslog.c	diff1 \|	diff2 \|	blob \| history
ntpd/complete.conf	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_config.c	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/ntp-project/ntp.git