]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 17de533) | patch
Merge conflicts.
authorOllivier Robert <roberto@FreeBSD.org>
Tue, 29 Oct 2002 20:04:27 +0000 (20:04 +0000)
committerOllivier Robert <roberto@FreeBSD.org>
Tue, 29 Oct 2002 20:04:27 +0000 (20:04 +0000)
commit8fe9403f63c99f62985f105d50e06032153e0611
treeef1818c9a91e581dafc61bfa572279965885011etree | snapshot
parent17de53307420098a9e71e04cf19036af1750828dcommit | diff
Merge conflicts.

MFC after: 1 month
contrib/ntp/ntpd/ntp_control.c diff | blob | history
contrib/ntp/ntpd/ntp_proto.c diff | blob | history
contrib/ntp/ntpd/ntp_resolver.c [deleted file] blob | history
Unnamed repository; edit this file 'description' to name the repository.