From owner-cvs-all  Tue Oct 29 12: 5:39 2002
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id C7DAB37B401; Tue, 29 Oct 2002 12:05:38 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7664E43E4A; Tue, 29 Oct 2002 12:05:38 -0800 (PST)
	(envelope-from roberto@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9TK4RmV049428;
	Tue, 29 Oct 2002 12:04:27 -0800 (PST)
	(envelope-from roberto@repoman.freebsd.org)
Received: (from roberto@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9TK4RXk049427;
	Tue, 29 Oct 2002 12:04:27 -0800 (PST)
Message-Id: <200210292004.g9TK4RXk049427@repoman.freebsd.org>
From: Ollivier Robert <roberto@FreeBSD.org>
Date: Tue, 29 Oct 2002 12:04:27 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/ntp/ntpd ntp_control.c ntp_proto.c
         ntp_resolver.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

roberto     2002/10/29 12:04:27 PST

  Modified files:
    contrib/ntp/ntpd     ntp_control.c ntp_proto.c 
  Removed files:
    contrib/ntp/ntpd     ntp_resolver.c 
  Log:
  Merge conflicts.
  
  MFC after:      1 month
  
  Revision  Changes    Path
  1.6       +3 -0      src/contrib/ntp/ntpd/ntp_control.c
  1.5       +3 -6      src/contrib/ntp/ntpd/ntp_proto.c
  1.2       +0 -987    src/contrib/ntp/ntpd/ntp_resolver.c (dead)

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