Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 29 Oct 2002 12:04:27 -0800 (PST)
From:      Ollivier Robert <roberto@FreeBSD.org>
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
Message-ID:  <200210292004.g9TK4RXk049427@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210292004.g9TK4RXk049427>