]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit - usr.sbin/ntp/doc/ntp.keys.5
projects / FreeBSD / stable / 10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e2a8300) | patch
MFC r314768:
authorcy <cy@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 11 Mar 2017 17:57:22 +0000 (17:57 +0000)
committercy <cy@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Sat, 11 Mar 2017 17:57:22 +0000 (17:57 +0000)
commitb4462ee59178d775f4b78d12a10b2149ac39a4e4
tree86ecc2ed195a797950d49b17a3b73d6a7c402b41tree | snapshot
parente2a8300d4eb83cb4daa2e8a3ffa12bcafb52be67commit | diff
MFC r314768:

Fix mismerge of r280849.

Reported by: des

git-svn-id: svn://svn.freebsd.org/base/stable/10@315080 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
usr.sbin/ntp/doc/ntp.keys.5 diff | blob | history
10-STABLE