Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 4 Nov 2002 11:38:47 -0800 (PST)
From:      Ollivier Robert <roberto@FreeBSD.org>
To:        cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   cvs commit: src/contrib/ntp/html driver42.html src/contrib/ntp/ntpd ntp_control.c
Message-ID:  <200211041938.gA4JclNO024486@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
roberto     2002/11/04 11:38:47 PST

  Modified files:
    contrib/ntp/ntpd     ntp_control.c 
  Removed files:
    contrib/ntp/html     driver42.html 
  Log:
  Merge conflicts.
  
  MFC after:      1 month
  
  Revision  Changes    Path
  1.2       +0 -39     src/contrib/ntp/html/driver42.html (dead)
  1.7       +2 -0      src/contrib/ntp/ntpd/ntp_control.c

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?200211041938.gA4JclNO024486>