From owner-cvs-all@FreeBSD.ORG Tue Jul 20 15:19:51 2004 Return-Path: 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 D6B1D16A4CE; Tue, 20 Jul 2004 15:19:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD8BE43D53; Tue, 20 Jul 2004 15:19:51 +0000 (GMT) (envelope-from roberto@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6KFJpSs098351; Tue, 20 Jul 2004 15:19:51 GMT (envelope-from roberto@repoman.freebsd.org) Received: (from roberto@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6KFJpgp098350; Tue, 20 Jul 2004 15:19:51 GMT (envelope-from roberto) Message-Id: <200407201519.i6KFJpgp098350@repoman.freebsd.org> From: Ollivier Robert Date: Tue, 20 Jul 2004 15:19:51 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/contrib/ntp README.cvs README.des README.rsa acconfig.h ntp_update stamp-h.in src/contrib/ntp/conf dewey.conf src/contrib/ntp/html Oncore-SHMEM.htm accopt.htm assoc.htm... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2004 15:19:52 -0000 roberto 2004-07-20 15:19:51 UTC FreeBSD src repository Removed files: contrib/ntp README.cvs README.des README.rsa acconfig.h ntp_update stamp-h.in contrib/ntp/conf dewey.conf contrib/ntp/html Oncore-SHMEM.htm accopt.htm assoc.htm audio.htm authopt.htm biblio.htm build.htm clockopt.htm config.htm confopt.htm copyright.htm debug.htm driver1.htm driver10.htm driver11.htm driver12.htm driver16.htm driver18.htm driver19.htm driver2.htm driver20.htm driver22.htm driver23.htm driver24.htm driver26.htm driver27.htm driver28.htm driver29.htm driver3.htm driver30.htm driver32.htm driver33.htm driver34.htm driver35.htm driver36.htm driver37.htm driver38.htm driver39.htm driver4.htm driver40.htm driver42.htm driver43.htm driver44.htm driver5.htm driver6.htm driver7.htm driver8.htm driver9.htm exec.htm extern.htm gadget.htm genkeys.htm hints.htm howto.htm htmlprimer.htm index.htm kern.htm kernpps.htm ldisc.htm leap.htm measure.htm miscopt.htm monopt.htm mx4200data.htm notes.htm ntpd.htm ntpdate.htm ntpdc.htm ntpq.htm ntptime.htm ntptrace.htm parsedata.htm parsenew.htm patches.htm porting.htm pps.htm prefer.htm qth.htm quick.htm rdebug.htm refclock.htm release.htm tickadj.htm contrib/ntp/html/hints sco.htm vxworks.htm winnt.htm contrib/ntp/include md5.h contrib/ntp/libntp authencrypt.c authparity.c contrib/ntp/librsaref Makefile.am Makefile.in contrib/ntp/ntptrace Makefile.am Makefile.in README ntptrace.c ntptrace.h contrib/ntp/util ntp-genkeys.c Log: Merge conflicts. Lots of added files, some removed and quite a large number of renames :( Revision Changes Path 1.2 +0 -24 src/contrib/ntp/README.cvs (dead) 1.2 +0 -20 src/contrib/ntp/README.des (dead) 1.2 +0 -105 src/contrib/ntp/README.rsa (dead) 1.2 +0 -457 src/contrib/ntp/acconfig.h (dead) 1.2 +0 -42 src/contrib/ntp/conf/dewey.conf (dead) 1.2 +0 -257 src/contrib/ntp/html/Oncore-SHMEM.htm (dead) 1.2 +0 -219 src/contrib/ntp/html/accopt.htm (dead) 1.2 +0 -170 src/contrib/ntp/html/assoc.htm (dead) 1.2 +0 -153 src/contrib/ntp/html/audio.htm (dead) 1.2 +0 -281 src/contrib/ntp/html/authopt.htm (dead) 1.2 +0 -259 src/contrib/ntp/html/biblio.htm (dead) 1.2 +0 -206 src/contrib/ntp/html/build.htm (dead) 1.2 +0 -193 src/contrib/ntp/html/clockopt.htm (dead) 1.2 +0 -291 src/contrib/ntp/html/config.htm (dead) 1.2 +0 -330 src/contrib/ntp/html/confopt.htm (dead) 1.2 +0 -123 src/contrib/ntp/html/copyright.htm (dead) 1.2 +0 -288 src/contrib/ntp/html/debug.htm (dead) 1.2 +0 -157 src/contrib/ntp/html/driver1.htm (dead) 1.2 +0 -114 src/contrib/ntp/html/driver10.htm (dead) 1.2 +0 -150 src/contrib/ntp/html/driver11.htm (dead) 1.2 +0 -98 src/contrib/ntp/html/driver12.htm (dead) 1.2 +0 -43 src/contrib/ntp/html/driver16.htm (dead) 1.2 +0 -235 src/contrib/ntp/html/driver18.htm (dead) 1.2 +0 -124 src/contrib/ntp/html/driver19.htm (dead) 1.2 +0 -137 src/contrib/ntp/html/driver2.htm (dead) 1.2 +0 -131 src/contrib/ntp/html/driver20.htm (dead) 1.2 +0 -129 src/contrib/ntp/html/driver22.htm (dead) 1.2 +0 -87 src/contrib/ntp/html/driver23.htm (dead) 1.2 +0 -85 src/contrib/ntp/html/driver24.htm (dead) 1.2 +0 -109 src/contrib/ntp/html/driver26.htm (dead) 1.2 +0 -634 src/contrib/ntp/html/driver27.htm (dead) 1.2 +0 -133 src/contrib/ntp/html/driver28.htm (dead) 1.2 +0 -1254 src/contrib/ntp/html/driver29.htm (dead) 1.2 +0 -131 src/contrib/ntp/html/driver3.htm (dead) 1.2 +0 -153 src/contrib/ntp/html/driver30.htm (dead) 1.2 +0 -42 src/contrib/ntp/html/driver32.htm (dead) 1.2 +0 -38 src/contrib/ntp/html/driver33.htm (dead) 1.2 +0 -54 src/contrib/ntp/html/driver34.htm (dead) 1.2 +0 -82 src/contrib/ntp/html/driver35.htm (dead) 1.2 +0 -839 src/contrib/ntp/html/driver36.htm (dead) 1.2 +0 -75 src/contrib/ntp/html/driver37.htm (dead) 1.2 +0 -191 src/contrib/ntp/html/driver38.htm (dead) 1.2 +0 -162 src/contrib/ntp/html/driver39.htm (dead) 1.2 +0 -126 src/contrib/ntp/html/driver4.htm (dead) 1.2 +0 -141 src/contrib/ntp/html/driver40.htm (dead) 1.2 +0 -41 src/contrib/ntp/html/driver42.htm (dead) 1.2 +0 -109 src/contrib/ntp/html/driver43.htm (dead) 1.2 +0 -131 src/contrib/ntp/html/driver44.htm (dead) 1.2 +0 -159 src/contrib/ntp/html/driver5.htm (dead) 1.2 +0 -253 src/contrib/ntp/html/driver6.htm (dead) 1.2 +0 -227 src/contrib/ntp/html/driver7.htm (dead) 1.2 +0 -343 src/contrib/ntp/html/driver8.htm (dead) 1.2 +0 -133 src/contrib/ntp/html/driver9.htm (dead) 1.2 +0 -292 src/contrib/ntp/html/exec.htm (dead) 1.2 +0 -40 src/contrib/ntp/html/extern.htm (dead) 1.2 +0 -111 src/contrib/ntp/html/gadget.htm (dead) 1.2 +0 -181 src/contrib/ntp/html/genkeys.htm (dead) 1.2 +0 -26 src/contrib/ntp/html/hints.htm (dead) 1.2 +0 -39 src/contrib/ntp/html/hints/sco.htm (dead) 1.2 +0 -153 src/contrib/ntp/html/hints/vxworks.htm (dead) 1.2 +0 -315 src/contrib/ntp/html/hints/winnt.htm (dead) 1.2 +0 -315 src/contrib/ntp/html/howto.htm (dead) 1.2 +0 -1198 src/contrib/ntp/html/htmlprimer.htm (dead) 1.2 +0 -201 src/contrib/ntp/html/index.htm (dead) 1.2 +0 -51 src/contrib/ntp/html/kern.htm (dead) 1.2 +0 -26 src/contrib/ntp/html/kernpps.htm (dead) 1.2 +0 -161 src/contrib/ntp/html/ldisc.htm (dead) 1.2 +0 -250 src/contrib/ntp/html/leap.htm (dead) 1.2 +0 -50 src/contrib/ntp/html/measure.htm (dead) 1.2 +0 -162 src/contrib/ntp/html/miscopt.htm (dead) 1.2 +0 -370 src/contrib/ntp/html/monopt.htm (dead) 1.2 +0 -445 src/contrib/ntp/html/mx4200data.htm (dead) 1.2 +0 -1544 src/contrib/ntp/html/notes.htm (dead) 1.2 +0 -183 src/contrib/ntp/html/ntpd.htm (dead) 1.2 +0 -185 src/contrib/ntp/html/ntpdate.htm (dead) 1.2 +0 -620 src/contrib/ntp/html/ntpdc.htm (dead) 1.2 +0 -747 src/contrib/ntp/html/ntpq.htm (dead) 1.2 +0 -96 src/contrib/ntp/html/ntptime.htm (dead) 1.2 +0 -82 src/contrib/ntp/html/ntptrace.htm (dead) 1.2 +0 -407 src/contrib/ntp/html/parsedata.htm (dead) 1.2 +0 -237 src/contrib/ntp/html/parsenew.htm (dead) 1.2 +0 -70 src/contrib/ntp/html/patches.htm (dead) 1.2 +0 -78 src/contrib/ntp/html/porting.htm (dead) 1.2 +0 -83 src/contrib/ntp/html/pps.htm (dead) 1.2 +0 -332 src/contrib/ntp/html/prefer.htm (dead) 1.2 +0 -64 src/contrib/ntp/html/qth.htm (dead) 1.2 +0 -99 src/contrib/ntp/html/quick.htm (dead) 1.2 +0 -67 src/contrib/ntp/html/rdebug.htm (dead) 1.2 +0 -126 src/contrib/ntp/html/refclock.htm (dead) 1.2 +0 -199 src/contrib/ntp/html/release.htm (dead) 1.2 +0 -103 src/contrib/ntp/html/tickadj.htm (dead) 1.2 +0 -51 src/contrib/ntp/include/md5.h (dead) 1.2 +0 -97 src/contrib/ntp/libntp/authencrypt.c (dead) 1.2 +0 -57 src/contrib/ntp/libntp/authparity.c (dead) 1.2 +0 -50 src/contrib/ntp/librsaref/Makefile.am (dead) 1.2 +0 -346 src/contrib/ntp/librsaref/Makefile.in (dead) 1.2 +0 -69 src/contrib/ntp/ntp_update (dead) 1.2 +0 -19 src/contrib/ntp/ntptrace/Makefile.am (dead) 1.2 +0 -349 src/contrib/ntp/ntptrace/Makefile.in (dead) 1.2 +0 -7 src/contrib/ntp/ntptrace/README (dead) 1.2 +0 -784 src/contrib/ntp/ntptrace/ntptrace.c (dead) 1.2 +0 -36 src/contrib/ntp/ntptrace/ntptrace.h (dead) 1.2 +0 -1 src/contrib/ntp/stamp-h.in (dead) 1.2 +0 -1042 src/contrib/ntp/util/ntp-genkeys.c (dead)