From owner-cvs-all  Fri Jan 28  7: 2:41 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 81DD21553A; Fri, 28 Jan 2000 07:02:37 -0800 (PST)
	(envelope-from roberto@FreeBSD.org)
Received: (from roberto@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id HAA48269;
	Fri, 28 Jan 2000 07:02:37 -0800 (PST)
	(envelope-from roberto@FreeBSD.org)
Message-Id: <200001281502.HAA48269@freefall.freebsd.org>
From: Ollivier Robert <roberto@FreeBSD.org>
Date: Fri, 28 Jan 2000 07:02:36 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/ntp/ntpd ntp_proto.c
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

roberto     2000/01/28 07:02:36 PST

  Modified files:
    contrib/ntp/ntpd     ntp_proto.c 
  Log:
  Merge conflicts with the import of 4.0.99b.
  
  Revision  Changes    Path
  1.3       +270 -230  src/contrib/ntp/ntpd/ntp_proto.c



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message