[ntp:commitlogs] incoming pull in deacon.udel.edu:/deacon/backroom/ntp-stable

stenn at whimsy.udel.edu stenn at whimsy.udel.edu
Wed Apr 22 17:41:19 UTC 2015


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     psp-deb1.ntp.org    
ROOT      /deacon/backroom/ntp-stable/home/stenn/ntp-dev 
LEVEL     1                   1                   
TIME_T    1396638816          1425999324          
UTC       20140404191336      20150310145524      
VERSION   bk-6.0.3            bk-6.1.3            

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-stable
    Received the following changesets
    
    ChangeSet at 1.3370, 2015-04-22 17:36:41+00:00, stenn at psp-fb1.ntp.org
      [Bug 2776] Improve ntpq's 'help keytype' on pre-OpenSSL 1.0
    
      ChangeLog at 1.1685 +2 -0
        [Bug 2776] Improve ntpq's 'help keytype' on pre-OpenSSL 1.0
    
    ChangeSet at 1.3369, 2015-04-22 17:33:58+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2776
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.26.5
    
      ntpq/ntpq.c at 1.158 +0 -1
        Auto merged
        MERGE: 1.155.1.2
    
    ChangeSet at 1.3265.26.5, 2015-04-22 17:33:08+00:00, stenn at psp-fb1.ntp.org
      Fix typo in patch for bug 2776
    
      ntpq/ntpq.c at 1.155.1.2 +1 -1
        Fix typo in patch for bug 2776
    
    ChangeSet at 1.3368, 2015-04-22 17:31:04+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2776
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.26.4
    
      ntpq/ntpq.c at 1.157 +2 -2
        Merge cleanup
        MERGE: 1.155.1.1
    
      sntp/m4/ntp_openssl.m4 at 1.23 +0 -1
        Auto merged
        MERGE: 1.21.1.1
    
    ChangeSet at 1.3265.26.4, 2015-04-22 11:25:54+00:00, stenn at psp-fb1.ntp.org
      [Bug 2776] Improve ntpq's 'help keytype'
    
      ntpq/ntpq.c at 1.155.1.1 +6 -1
        [Bug 2776] Improve ntpq's 'help keytype'
    
      sntp/m4/ntp_openssl.m4 at 1.21.1.1 +1 -0
        [Bug 2776] Improve ntpq's 'help keytype'
    
    ChangeSet at 1.3367, 2015-04-22 10:42:25+00:00, stenn at deacon.udel.edu
      NTP_4_3_16
      TAG: NTP_4_3_16
    
      ChangeLog at 1.1684 +1 -0
        NTP_4_3_16
    
      ntpd/invoke-ntp.conf.texi at 1.18 +1 -1
        NTP_4_3_16
    
      ntpd/invoke-ntp.keys.texi at 1.18 +1 -1
        NTP_4_3_16
    
      ntpd/invoke-ntpd.texi at 1.19 +2 -2
        NTP_4_3_16
    
      ntpd/ntp.conf.5man at 1.18 +3 -3
        NTP_4_3_16
    
      ntpd/ntp.conf.5mdoc at 1.18 +2 -2
        NTP_4_3_16
    
      ntpd/ntp.conf.html at 1.18 +1 -1
        NTP_4_3_16
    
      ntpd/ntp.conf.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      ntpd/ntp.conf.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      ntpd/ntp.keys.5man at 1.18 +2 -2
        NTP_4_3_16
    
      ntpd/ntp.keys.5mdoc at 1.18 +2 -2
        NTP_4_3_16
    
      ntpd/ntp.keys.html at 1.18 +1 -1
        NTP_4_3_16
    
      ntpd/ntp.keys.man.in at 1.18 +2 -2
        NTP_4_3_16
    
      ntpd/ntp.keys.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      ntpd/ntpd-opts.c at 1.19 +7 -7
        NTP_4_3_16
    
      ntpd/ntpd-opts.h at 1.19 +3 -3
        NTP_4_3_16
    
      ntpd/ntpd.1ntpdman at 1.19 +3 -3
        NTP_4_3_16
    
      ntpd/ntpd.1ntpdmdoc at 1.19 +2 -2
        NTP_4_3_16
    
      ntpd/ntpd.html at 1.18 +2 -2
        NTP_4_3_16
    
      ntpd/ntpd.man.in at 1.19 +3 -3
        NTP_4_3_16
    
      ntpd/ntpd.mdoc.in at 1.19 +2 -2
        NTP_4_3_16
    
      ntpdc/invoke-ntpdc.texi at 1.18 +2 -2
        NTP_4_3_16
    
      ntpdc/ntpdc-opts.c at 1.18 +7 -7
        NTP_4_3_16
    
      ntpdc/ntpdc-opts.h at 1.18 +3 -3
        NTP_4_3_16
    
      ntpdc/ntpdc.1ntpdcman at 1.18 +3 -3
        NTP_4_3_16
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.18 +2 -2
        NTP_4_3_16
    
      ntpdc/ntpdc.html at 1.18 +2 -2
        NTP_4_3_16
    
      ntpdc/ntpdc.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      ntpdc/ntpdc.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      ntpq/invoke-ntpq.texi at 1.18 +2 -2
        NTP_4_3_16
    
      ntpq/ntpq-opts.c at 1.18 +7 -7
        NTP_4_3_16
    
      ntpq/ntpq-opts.h at 1.18 +3 -3
        NTP_4_3_16
    
      ntpq/ntpq.1ntpqman at 1.18 +3 -3
        NTP_4_3_16
    
      ntpq/ntpq.1ntpqmdoc at 1.18 +2 -2
        NTP_4_3_16
    
      ntpq/ntpq.html at 1.18 +2 -2
        NTP_4_3_16
    
      ntpq/ntpq.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      ntpq/ntpq.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.18 +2 -2
        NTP_4_3_16
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.18 +7 -7
        NTP_4_3_16
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.18 +3 -3
        NTP_4_3_16
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.18 +3 -3
        NTP_4_3_16
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.18 +2 -2
        NTP_4_3_16
    
      ntpsnmpd/ntpsnmpd.html at 1.18 +1 -1
        NTP_4_3_16
    
      ntpsnmpd/ntpsnmpd.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      packageinfo.sh at 1.18 +1 -1
        NTP_4_3_16
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/calc_tickadj/calc_tickadj.html at 1.18 +1 -1
        NTP_4_3_16
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.18 +1 -1
        NTP_4_3_16
    
      scripts/invoke-plot_summary.texi at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/invoke-summary.texi at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntp-wait/ntp-wait-opts at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntp-wait/ntp-wait.html at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntp-wait/ntp-wait.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntpsweep/ntpsweep-opts at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntpsweep/ntpsweep.html at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntpsweep/ntpsweep.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntptrace/ntptrace-opts at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntptrace/ntptrace.html at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/ntptrace/ntptrace.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/plot_summary-opts at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/plot_summary.1plot_summaryman at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/plot_summary.1plot_summarymdoc at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/plot_summary.html at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/plot_summary.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/plot_summary.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/summary-opts at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/summary.1summaryman at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/summary.1summarymdoc at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/summary.html at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/summary.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      scripts/summary.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      scripts/update-leap/invoke-update-leap.texi at 1.11 +1 -1
        NTP_4_3_16
    
      scripts/update-leap/update-leap-opts at 1.11 +2 -2
        NTP_4_3_16
    
      scripts/update-leap/update-leap.1update-leapman at 1.11 +3 -3
        NTP_4_3_16
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.11 +2 -2
        NTP_4_3_16
    
      scripts/update-leap/update-leap.html at 1.11 +1 -1
        NTP_4_3_16
    
      scripts/update-leap/update-leap.man.in at 1.11 +3 -3
        NTP_4_3_16
    
      scripts/update-leap/update-leap.mdoc.in at 1.11 +2 -2
        NTP_4_3_16
    
      sntp/invoke-sntp.texi at 1.18 +2 -2
        NTP_4_3_16
    
      sntp/sntp-opts.c at 1.18 +7 -7
        NTP_4_3_16
    
      sntp/sntp-opts.h at 1.18 +3 -3
        NTP_4_3_16
    
      sntp/sntp.1sntpman at 1.18 +3 -3
        NTP_4_3_16
    
      sntp/sntp.1sntpmdoc at 1.18 +2 -2
        NTP_4_3_16
    
      sntp/sntp.html at 1.18 +2 -2
        NTP_4_3_16
    
      sntp/sntp.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      sntp/sntp.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
      util/invoke-ntp-keygen.texi at 1.18 +2 -2
        NTP_4_3_16
    
      util/ntp-keygen-opts.c at 1.18 +7 -7
        NTP_4_3_16
    
      util/ntp-keygen-opts.h at 1.18 +3 -3
        NTP_4_3_16
    
      util/ntp-keygen.1ntp-keygenman at 1.18 +3 -3
        NTP_4_3_16
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.18 +2 -2
        NTP_4_3_16
    
      util/ntp-keygen.html at 1.18 +2 -2
        NTP_4_3_16
    
      util/ntp-keygen.man.in at 1.18 +3 -3
        NTP_4_3_16
    
      util/ntp-keygen.mdoc.in at 1.18 +2 -2
        NTP_4_3_16
    
    ChangeSet at 1.3366, 2015-04-22 06:06:06-04:00, stenn at deacon.udel.edu
      [Bug 2776] Improve ntpq's 'help keytype'
    
      ntpq/ntpq.c at 1.156 +1 -1
        [Bug 2776] Improve ntpq's 'help keytype'
    
      sntp/m4/ntp_openssl.m4 at 1.22 +1 -0
        [Bug 2776] Improve ntpq's 'help keytype'
    
    ChangeSet at 1.3365, 2015-04-21 09:57:39+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-2776
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.3265.26.3
    
      ChangeLog at 1.1683 +1 -0
        Merge cleanup
        MERGE: 1.1593.26.3
    
    ChangeSet at 1.3265.26.3, 2015-04-21 09:48:05+00:00, stenn at psp-deb1.ntp.org
      [Bug 2776] Improve ntpq's 'help keytype'
    
      ChangeLog at 1.1593.26.3 +1 -0
        [Bug 2776] Improve ntpq's 'help keytype'
    
      ntpq/ntpq.c at 1.155 +132 -8
        [Bug 2776] Improve ntpq's 'help keytype'
    
    ChangeSet at 1.3364, 2015-04-21 03:08:40-04:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.26.2
    
      ChangeLog at 1.1682 +3 -1
        Merge cleanup
        MERGE: 1.1593.26.2
    
    ChangeSet at 1.3363, 2015-04-20 12:00:27+00:00, stenn at deacon.udel.edu
      NTP_4_3_15
      TAG: NTP_4_3_15
    
      ChangeLog at 1.1681 +1 -0
        NTP_4_3_15
    
      ntpd/invoke-ntp.conf.texi at 1.17 +1 -1
        NTP_4_3_15
    
      ntpd/invoke-ntp.keys.texi at 1.17 +1 -1
        NTP_4_3_15
    
      ntpd/invoke-ntpd.texi at 1.18 +2 -2
        NTP_4_3_15
    
      ntpd/ntp.conf.5man at 1.17 +3 -3
        NTP_4_3_15
    
      ntpd/ntp.conf.5mdoc at 1.17 +2 -2
        NTP_4_3_15
    
      ntpd/ntp.conf.html at 1.17 +1 -1
        NTP_4_3_15
    
      ntpd/ntp.conf.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      ntpd/ntp.conf.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      ntpd/ntp.keys.5man at 1.17 +2 -2
        NTP_4_3_15
    
      ntpd/ntp.keys.5mdoc at 1.17 +2 -2
        NTP_4_3_15
    
      ntpd/ntp.keys.html at 1.17 +1 -1
        NTP_4_3_15
    
      ntpd/ntp.keys.man.in at 1.17 +2 -2
        NTP_4_3_15
    
      ntpd/ntp.keys.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      ntpd/ntpd-opts.c at 1.18 +7 -7
        NTP_4_3_15
    
      ntpd/ntpd-opts.h at 1.18 +3 -3
        NTP_4_3_15
    
      ntpd/ntpd.1ntpdman at 1.18 +3 -3
        NTP_4_3_15
    
      ntpd/ntpd.1ntpdmdoc at 1.18 +2 -2
        NTP_4_3_15
    
      ntpd/ntpd.html at 1.17 +2 -2
        NTP_4_3_15
    
      ntpd/ntpd.man.in at 1.18 +3 -3
        NTP_4_3_15
    
      ntpd/ntpd.mdoc.in at 1.18 +2 -2
        NTP_4_3_15
    
      ntpdc/invoke-ntpdc.texi at 1.17 +2 -2
        NTP_4_3_15
    
      ntpdc/ntpdc-opts.c at 1.17 +7 -7
        NTP_4_3_15
    
      ntpdc/ntpdc-opts.h at 1.17 +3 -3
        NTP_4_3_15
    
      ntpdc/ntpdc.1ntpdcman at 1.17 +3 -3
        NTP_4_3_15
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.17 +2 -2
        NTP_4_3_15
    
      ntpdc/ntpdc.html at 1.17 +2 -2
        NTP_4_3_15
    
      ntpdc/ntpdc.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      ntpdc/ntpdc.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      ntpq/invoke-ntpq.texi at 1.17 +2 -2
        NTP_4_3_15
    
      ntpq/ntpq-opts.c at 1.17 +7 -7
        NTP_4_3_15
    
      ntpq/ntpq-opts.h at 1.17 +3 -3
        NTP_4_3_15
    
      ntpq/ntpq.1ntpqman at 1.17 +3 -3
        NTP_4_3_15
    
      ntpq/ntpq.1ntpqmdoc at 1.17 +2 -2
        NTP_4_3_15
    
      ntpq/ntpq.html at 1.17 +2 -2
        NTP_4_3_15
    
      ntpq/ntpq.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      ntpq/ntpq.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.17 +2 -2
        NTP_4_3_15
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.17 +7 -7
        NTP_4_3_15
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.17 +3 -3
        NTP_4_3_15
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.17 +3 -3
        NTP_4_3_15
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.17 +2 -2
        NTP_4_3_15
    
      ntpsnmpd/ntpsnmpd.html at 1.17 +1 -1
        NTP_4_3_15
    
      ntpsnmpd/ntpsnmpd.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      packageinfo.sh at 1.17 +1 -1
        NTP_4_3_15
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/calc_tickadj/calc_tickadj.html at 1.17 +1 -1
        NTP_4_3_15
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.17 +1 -1
        NTP_4_3_15
    
      scripts/invoke-plot_summary.texi at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/invoke-summary.texi at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntp-wait/ntp-wait-opts at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntp-wait/ntp-wait.html at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntp-wait/ntp-wait.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntpsweep/ntpsweep-opts at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntpsweep/ntpsweep.html at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntpsweep/ntpsweep.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntptrace/ntptrace-opts at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntptrace/ntptrace.html at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/ntptrace/ntptrace.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/plot_summary-opts at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/plot_summary.1plot_summaryman at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/plot_summary.1plot_summarymdoc at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/plot_summary.html at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/plot_summary.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/plot_summary.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/summary-opts at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/summary.1summaryman at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/summary.1summarymdoc at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/summary.html at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/summary.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      scripts/summary.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      scripts/update-leap/invoke-update-leap.texi at 1.10 +1 -1
        NTP_4_3_15
    
      scripts/update-leap/update-leap-opts at 1.10 +2 -2
        NTP_4_3_15
    
      scripts/update-leap/update-leap.1update-leapman at 1.10 +3 -3
        NTP_4_3_15
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.10 +2 -2
        NTP_4_3_15
    
      scripts/update-leap/update-leap.html at 1.10 +1 -1
        NTP_4_3_15
    
      scripts/update-leap/update-leap.man.in at 1.10 +3 -3
        NTP_4_3_15
    
      scripts/update-leap/update-leap.mdoc.in at 1.10 +2 -2
        NTP_4_3_15
    
      sntp/invoke-sntp.texi at 1.17 +2 -2
        NTP_4_3_15
    
      sntp/sntp-opts.c at 1.17 +7 -7
        NTP_4_3_15
    
      sntp/sntp-opts.h at 1.17 +3 -3
        NTP_4_3_15
    
      sntp/sntp.1sntpman at 1.17 +3 -3
        NTP_4_3_15
    
      sntp/sntp.1sntpmdoc at 1.17 +2 -2
        NTP_4_3_15
    
      sntp/sntp.html at 1.17 +2 -2
        NTP_4_3_15
    
      sntp/sntp.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      sntp/sntp.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
      util/invoke-ntp-keygen.texi at 1.17 +2 -2
        NTP_4_3_15
    
      util/ntp-keygen-opts.c at 1.17 +7 -7
        NTP_4_3_15
    
      util/ntp-keygen-opts.h at 1.17 +3 -3
        NTP_4_3_15
    
      util/ntp-keygen.1ntp-keygenman at 1.17 +3 -3
        NTP_4_3_15
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.17 +2 -2
        NTP_4_3_15
    
      util/ntp-keygen.html at 1.17 +2 -2
        NTP_4_3_15
    
      util/ntp-keygen.man.in at 1.17 +3 -3
        NTP_4_3_15
    
      util/ntp-keygen.mdoc.in at 1.17 +2 -2
        NTP_4_3_15
    
    ChangeSet at 1.3362, 2015-04-20 07:30:53-04:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.26.1
    
      ChangeLog at 1.1680 +2 -1
        Merge cleanup
        MERGE: 1.1593.26.1
    
    ChangeSet at 1.3361, 2015-04-20 10:04:47+00:00, stenn at psp-deb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1679 +1 -0
        merge cleanup
    
    ChangeSet at 1.3360, 2015-04-20 10:02:54+00:00, stenn at psp-deb1.ntp.org
      Merge bk://bk.ntp.org/ntp-dev
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.3357.1.1
    
      ChangeLog at 1.1678 +0 -0
        Auto merged
        MERGE: 1.1675.1.1
    
    ChangeSet at 1.3357.1.1, 2015-04-20 10:02:05+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-2782
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.3265.1.59
    
      ChangeLog at 1.1675.1.1 +0 -1
        Auto merged
        MERGE: 1.1593.1.44
    
      configure.ac at 1.588 +0 -0
        Auto merged
        MERGE: 1.581.1.6
    
      ntpd/refclock_shm.c at 1.35 +0 -6
        Auto merged
        MERGE: 1.33.1.2
    
    ChangeSet at 1.3265.1.59, 2015-04-20 10:00:46+00:00, stenn at psp-deb1.ntp.org
      [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX
    
      ChangeLog at 1.1593.1.44 +1 -0
        [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX
    
      configure.ac at 1.581.1.6 +21 -5
        [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX
    
      ntpd/refclock_shm.c at 1.33.1.2 +2 -2
        [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX
    
    ChangeSet at 1.3265.1.58, 2015-04-20 08:45:15+00:00, stenn at psp-fb1.ntp.org
      Merge bk://bk.ntp.org/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2782
      MERGE: 1.3265.13.18
    
      ChangeLog at 1.1593.1.43 +2 -2
        Merge cleanup
        MERGE: 1.1593.13.14
    
      configure.ac at 1.581.1.5 +0 -0
        Auto merged
        MERGE: 1.581.2.1
    
    ChangeSet at 1.3359, 2015-04-19 20:33:51-04:00, stenn at deacon.udel.edu
      merge cleanup
    
      ChangeLog at 1.1677 +4 -0
        merge cleanup
    
    ChangeSet at 1.3358, 2015-04-19 20:05:52-04:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.1.57
    
      ChangeLog at 1.1676 +0 -0
        Auto merged
        MERGE: 1.1593.1.42
    
    ChangeSet at 1.3357, 2015-04-07 09:42:51+00:00, stenn at deacon.udel.edu
      NTP_4_3_14
      TAG: NTP_4_3_14
    
      ChangeLog at 1.1675 +1 -0
        NTP_4_3_14
    
      ntpd/invoke-ntp.conf.texi at 1.16 +1 -1
        NTP_4_3_14
    
      ntpd/invoke-ntp.keys.texi at 1.16 +1 -1
        NTP_4_3_14
    
      ntpd/invoke-ntpd.texi at 1.17 +2 -2
        NTP_4_3_14
    
      ntpd/ntp.conf.5man at 1.16 +3 -3
        NTP_4_3_14
    
      ntpd/ntp.conf.5mdoc at 1.16 +2 -2
        NTP_4_3_14
    
      ntpd/ntp.conf.html at 1.16 +1 -1
        NTP_4_3_14
    
      ntpd/ntp.conf.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      ntpd/ntp.conf.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      ntpd/ntp.keys.5man at 1.16 +2 -2
        NTP_4_3_14
    
      ntpd/ntp.keys.5mdoc at 1.16 +2 -2
        NTP_4_3_14
    
      ntpd/ntp.keys.html at 1.16 +1 -1
        NTP_4_3_14
    
      ntpd/ntp.keys.man.in at 1.16 +2 -2
        NTP_4_3_14
    
      ntpd/ntp.keys.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      ntpd/ntpd-opts.c at 1.17 +7 -7
        NTP_4_3_14
    
      ntpd/ntpd-opts.h at 1.17 +3 -3
        NTP_4_3_14
    
      ntpd/ntpd.1ntpdman at 1.17 +3 -3
        NTP_4_3_14
    
      ntpd/ntpd.1ntpdmdoc at 1.17 +2 -2
        NTP_4_3_14
    
      ntpd/ntpd.html at 1.16 +2 -2
        NTP_4_3_14
    
      ntpd/ntpd.man.in at 1.17 +3 -3
        NTP_4_3_14
    
      ntpd/ntpd.mdoc.in at 1.17 +2 -2
        NTP_4_3_14
    
      ntpdc/invoke-ntpdc.texi at 1.16 +2 -2
        NTP_4_3_14
    
      ntpdc/ntpdc-opts.c at 1.16 +7 -7
        NTP_4_3_14
    
      ntpdc/ntpdc-opts.h at 1.16 +3 -3
        NTP_4_3_14
    
      ntpdc/ntpdc.1ntpdcman at 1.16 +3 -3
        NTP_4_3_14
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.16 +2 -2
        NTP_4_3_14
    
      ntpdc/ntpdc.html at 1.16 +2 -2
        NTP_4_3_14
    
      ntpdc/ntpdc.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      ntpdc/ntpdc.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      ntpq/invoke-ntpq.texi at 1.16 +2 -2
        NTP_4_3_14
    
      ntpq/ntpq-opts.c at 1.16 +7 -7
        NTP_4_3_14
    
      ntpq/ntpq-opts.h at 1.16 +3 -3
        NTP_4_3_14
    
      ntpq/ntpq.1ntpqman at 1.16 +3 -3
        NTP_4_3_14
    
      ntpq/ntpq.1ntpqmdoc at 1.16 +2 -2
        NTP_4_3_14
    
      ntpq/ntpq.html at 1.16 +2 -2
        NTP_4_3_14
    
      ntpq/ntpq.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      ntpq/ntpq.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.16 +2 -2
        NTP_4_3_14
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.16 +7 -7
        NTP_4_3_14
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.16 +3 -3
        NTP_4_3_14
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.16 +3 -3
        NTP_4_3_14
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.16 +2 -2
        NTP_4_3_14
    
      ntpsnmpd/ntpsnmpd.html at 1.16 +1 -1
        NTP_4_3_14
    
      ntpsnmpd/ntpsnmpd.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      packageinfo.sh at 1.16 +1 -1
        NTP_4_3_14
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/calc_tickadj/calc_tickadj.html at 1.16 +1 -1
        NTP_4_3_14
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.16 +1 -1
        NTP_4_3_14
    
      scripts/invoke-plot_summary.texi at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/invoke-summary.texi at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntp-wait/ntp-wait-opts at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntp-wait/ntp-wait.html at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntp-wait/ntp-wait.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntpsweep/ntpsweep-opts at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntpsweep/ntpsweep.html at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntpsweep/ntpsweep.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntptrace/ntptrace-opts at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntptrace/ntptrace.html at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/ntptrace/ntptrace.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/plot_summary-opts at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/plot_summary.1plot_summaryman at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/plot_summary.1plot_summarymdoc at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/plot_summary.html at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/plot_summary.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/plot_summary.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/summary-opts at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/summary.1summaryman at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/summary.1summarymdoc at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/summary.html at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/summary.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      scripts/summary.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      scripts/update-leap/invoke-update-leap.texi at 1.9 +1 -1
        NTP_4_3_14
    
      scripts/update-leap/update-leap-opts at 1.9 +2 -2
        NTP_4_3_14
    
      scripts/update-leap/update-leap.1update-leapman at 1.9 +3 -3
        NTP_4_3_14
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.9 +2 -2
        NTP_4_3_14
    
      scripts/update-leap/update-leap.html at 1.9 +1 -1
        NTP_4_3_14
    
      scripts/update-leap/update-leap.man.in at 1.9 +3 -3
        NTP_4_3_14
    
      scripts/update-leap/update-leap.mdoc.in at 1.9 +2 -2
        NTP_4_3_14
    
      sntp/invoke-sntp.texi at 1.16 +2 -2
        NTP_4_3_14
    
      sntp/sntp-opts.c at 1.16 +7 -7
        NTP_4_3_14
    
      sntp/sntp-opts.h at 1.16 +3 -3
        NTP_4_3_14
    
      sntp/sntp.1sntpman at 1.16 +3 -3
        NTP_4_3_14
    
      sntp/sntp.1sntpmdoc at 1.16 +2 -2
        NTP_4_3_14
    
      sntp/sntp.html at 1.16 +2 -2
        NTP_4_3_14
    
      sntp/sntp.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      sntp/sntp.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
      util/invoke-ntp-keygen.texi at 1.16 +2 -2
        NTP_4_3_14
    
      util/ntp-keygen-opts.c at 1.16 +7 -7
        NTP_4_3_14
    
      util/ntp-keygen-opts.h at 1.16 +3 -3
        NTP_4_3_14
    
      util/ntp-keygen.1ntp-keygenman at 1.16 +3 -3
        NTP_4_3_14
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.16 +2 -2
        NTP_4_3_14
    
      util/ntp-keygen.html at 1.16 +2 -2
        NTP_4_3_14
    
      util/ntp-keygen.man.in at 1.16 +3 -3
        NTP_4_3_14
    
      util/ntp-keygen.mdoc.in at 1.16 +2 -2
        NTP_4_3_14
    
    ChangeSet at 1.3356, 2015-04-07 05:17:11-04:00, stenn at deacon.udel.edu
      Import from 4.2.8p2
    
      ChangeLog at 1.1674 +4 -0
        Import from 4.2.8p2
    
    ChangeSet at 1.3355, 2015-04-07 05:11:16-04:00, stenn at deacon.udel.edu
      Merge psp-deb1.ntp.org:ntp-dev
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3353.1.1
    
      ChangeLog at 1.1673 +0 -0
        Auto merged
        MERGE: 1.1671.1.1
    
      scripts/update-leap/invoke-update-leap.texi at 1.8 +0 -0
        Auto merged
        MERGE: 1.6.1.1
    
      scripts/update-leap/update-leap-opts at 1.8 +0 -0
        Auto merged
        MERGE: 1.6.1.1
    
      scripts/update-leap/update-leap.1update-leapman at 1.8 +0 -0
        Auto merged
        MERGE: 1.6.1.1
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.8 +0 -0
        Auto merged
        MERGE: 1.6.1.1
    
      scripts/update-leap/update-leap.html at 1.8 +0 -0
        Auto merged
        MERGE: 1.6.1.1
    
      scripts/update-leap/update-leap.man.in at 1.8 +0 -0
        Auto merged
        MERGE: 1.6.1.1
    
      scripts/update-leap/update-leap.mdoc.in at 1.8 +0 -0
        Auto merged
        MERGE: 1.6.1.1
    
    ChangeSet at 1.3353.1.1, 2015-04-07 09:06:12+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.1.55
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.211 +0 -0
        Auto merged
        MERGE: 1.202.7.2
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.7.2 +0 -0
        Merge rename: ntpd/ntp.conf.5man -> BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.84 +0 -0
        Auto merged
        MERGE: 1.76.5.2
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.76.5.2 +0 -0
        Merge rename: scripts/calc_tickadj/invoke-calc_tickadj.texi -> BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.80 +0 -0
        Auto merged
        MERGE: 1.72.6.2
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.72.6.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc -> BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.207 +0 -0
        Auto merged
        MERGE: 1.199.6.2
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.199.6.2 +0 -0
        Merge rename: ntpd/ntp.keys.5mdoc -> BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.101 +0 -0
        Auto merged
        MERGE: 1.93.5.2
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.93.5.2 +0 -0
        Merge rename: scripts/invoke-plot_summary.texi -> BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.87 +0 -0
        Auto merged
        MERGE: 1.79.5.2
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.79.5.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepmdoc -> BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.88 +0 -0
        Auto merged
        MERGE: 1.80.5.2
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.80.5.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.mdoc.in -> BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.310.6.2 +0 -0
        Merge rename: ntpd/ntpd.man.in -> BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.102 +0 -0
        Auto merged
        MERGE: 1.94.5.2
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.94.5.2 +0 -0
        Merge rename: scripts/plot_summary.html -> BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.508 +0 -0
        Auto merged
        MERGE: 1.500.6.2
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.500.6.2 +0 -0
        Merge rename: ntpq/ntpq-opts.h -> BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.99 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.91.5.2 +0 -0
        Merge rename: scripts/plot_summary.1plot_summaryman -> BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.48 +0 -0
        Auto merged
        MERGE: 1.40.6.2
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.40.6.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace-opts -> BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.48 +0 -0
        Auto merged
        MERGE: 1.40.6.2
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.40.6.2 +0 -0
        Merge rename: scripts/summary-opts -> BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.321 +0 -0
        Auto merged
        MERGE: 1.313.6.2
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.313.6.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqmdoc -> BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.207 +0 -0
        Auto merged
        MERGE: 1.199.6.2
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.199.6.2 +0 -0
        Merge rename: ntpd/ntp.keys.mdoc.in -> BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.82 +0 -0
        Auto merged
        MERGE: 1.74.5.2
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.74.5.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.html -> BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.80 +0 -0
        Auto merged
        MERGE: 1.72.6.2
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.72.6.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.mdoc.in -> BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.506 +0 -0
        Auto merged
        MERGE: 1.498.6.2
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.498.6.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.h -> BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.505 +0 -0
        Auto merged
        MERGE: 1.497.6.2
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.497.6.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.c -> BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.321 +0 -0
        Auto merged
        MERGE: 1.313.6.2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.313.6.2 +0 -0
        Merge rename: sntp/sntp.1sntpman -> BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.161 +0 -0
        Auto merged
        MERGE: 1.153.5.2
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.153.5.2 +0 -0
        Merge rename: ntpq/ntpq.html -> BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.310.6.2 +0 -0
        Merge rename: util/ntp-keygen.man.in -> BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.48 +0 -0
        Auto merged
        MERGE: 1.40.6.2
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.40.6.2 +0 -0
        Merge rename: scripts/plot_summary-opts -> BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.79 +0 -0
        Auto merged
        MERGE: 1.71.5.2
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.71.5.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.man.in -> BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.99 +0 -0
        Auto merged
        MERGE: 1.91.6.2
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.91.6.2 +0 -0
        Merge rename: scripts/ntptrace/invoke-ntptrace.texi -> BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.207 +0 -0
        Auto merged
        MERGE: 1.199.6.2
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.199.6.2 +0 -0
        Merge rename: ntpd/ntp.keys.5man -> BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.510 +0 -0
        Auto merged
        MERGE: 1.502.6.2
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.502.6.2 +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.88 +0 -0
        Auto merged
        MERGE: 1.80.6.2
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.80.6.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.mdoc.in -> BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.310.6.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc -> BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.504 +8 -14
        merge cleanup
        MERGE: 1.492.5.3
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.492.5.3 +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.101 +0 -0
        Auto merged
        MERGE: 1.93.5.2
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.93.5.2 +0 -0
        Merge rename: scripts/invoke-summary.texi -> BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.310.6.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcman -> BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.504 +0 -0
        Auto merged
        MERGE: 1.496.6.2
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.496.6.2 +0 -0
        Merge rename: sntp/sntp-opts.c -> BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.321 +0 -0
        Auto merged
        MERGE: 1.313.6.2
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.313.6.2 +0 -0
        Merge rename: sntp/sntp.mdoc.in -> BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.310.6.2 +0 -0
        Merge rename: ntpd/ntpd.1ntpdman -> BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.310.6.2 +0 -0
        Merge rename: ntpd/ntpd.mdoc.in -> BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.331 +0 -0
        Auto merged
        MERGE: 1.323.6.2
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.323.6.2 +0 -0
        Merge rename: ntpdc/ntpdc.html -> BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.80 +0 -0
        Auto merged
        MERGE: 1.72.5.2
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.72.5.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjman -> BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.327 +0 -0
        Auto merged
        MERGE: 1.319.6.2
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.319.6.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.html -> BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.99 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.91.5.2 +0 -0
        Merge rename: scripts/summary.1summaryman -> BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.99 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.91.5.2 +0 -0
        Merge rename: scripts/summary.mdoc.in -> BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.321 +0 -0
        Auto merged
        MERGE: 1.313.6.2
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.313.6.2 +0 -0
        Merge rename: sntp/sntp.1sntpmdoc -> BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.310.6.2 +0 -0
        Merge rename: ntpd/ntpd.1ntpdmdoc -> BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.165 +0 -0
        Auto merged
        MERGE: 1.157.5.2
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.157.5.2 +0 -0
        Merge rename: util/ntp-keygen.html -> BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.321 +0 -0
        Auto merged
        MERGE: 1.313.6.2
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.313.6.2 +0 -0
        Merge rename: ntpq/ntpq.man.in -> BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.87 +0 -0
        Auto merged
        MERGE: 1.79.5.2
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.79.5.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepman -> BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.99 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.91.5.2 +0 -0
        Merge rename: scripts/ntpsweep/invoke-ntpsweep.texi -> BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.321 +0 -0
        Auto merged
        MERGE: 1.313.6.2
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.313.6.2 +0 -0
        Merge rename: sntp/sntp.man.in -> BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.100 +0 -0
        Auto merged
        MERGE: 1.92.5.2
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.92.5.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.html -> BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.487 +0 -0
        Auto merged
        MERGE: 1.479.6.2
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.479.6.2 +0 -0
        Merge rename: ntpdc/invoke-ntpdc.texi -> BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.87 +0 -0
        Auto merged
        MERGE: 1.79.5.2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.79.5.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.man.in -> BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.490 +0 -0
        Auto merged
        MERGE: 1.482.6.2
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.482.6.2 +0 -0
        Merge rename: util/invoke-ntp-keygen.texi -> BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.493 +0 -0
        Auto merged
        MERGE: 1.485.6.2
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.485.6.2 +0 -0
        Merge rename: ntpq/invoke-ntpq.texi -> BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.169 +0 -0
        Auto merged
        MERGE: 1.161.5.2
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.161.5.2 +0 -0
        Merge rename: ntpd/ntp.conf.html -> BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.489 +0 -0
        Auto merged
        MERGE: 1.481.6.2
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.481.6.2 +0 -0
        Merge rename: ntpsnmpd/invoke-ntpsnmpd.texi -> BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.100 +0 -0
        Auto merged
        MERGE: 1.92.6.2
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.92.6.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.html -> BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.489 +0 -0
        Auto merged
        MERGE: 1.481.6.2
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.481.6.2 +0 -0
        Merge rename: ntpd/invoke-ntpd.texi -> BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.310.6.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.mdoc.in -> BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.170 +0 -0
        Auto merged
        MERGE: 1.162.5.2
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.162.5.2 +0 -0
        Merge rename: ntpd/ntp.keys.html -> BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.308 +0 -0
        Auto merged
        MERGE: 1.300.6.2
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.300.6.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.mdoc.in -> BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.308 +0 -0
        Auto merged
        MERGE: 1.300.5.2
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.300.5.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.man.in -> BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.211 +0 -0
        Auto merged
        MERGE: 1.202.7.2
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.7.2 +0 -0
        Merge rename: ntpd/ntp.conf.mdoc.in -> BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.46 +0 -0
        Auto merged
        MERGE: 1.38.6.2
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.38.6.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait-opts -> BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.321 +0 -0
        Auto merged
        MERGE: 1.313.6.2
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.313.6.2 +0 -0
        Merge rename: ntpq/ntpq.mdoc.in -> BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.164 +0 -0
        Auto merged
        MERGE: 1.156.5.2
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.156.5.2 +0 -0
        Merge rename: ntpd/ntpd.html -> BitKeeper/deleted/93/ntpd.html~fab305284d96b809
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.177 +0 -0
        Auto merged
        MERGE: 1.168.7.2
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.7.2 +0 -0
        Merge rename: ntpd/invoke-ntp.conf.texi -> BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.99 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.91.5.2 +0 -0
        Merge rename: scripts/summary.man.in -> BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.510 +0 -0
        Auto merged
        MERGE: 1.502.7.2
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.502.7.2 +0 -0
        Merge rename: ntpd/ntpd-opts.c -> BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.308 +0 -0
        Auto merged
        MERGE: 1.300.5.2
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.300.5.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitman -> BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.310.6.2 +0 -0
        Merge rename: util/ntp-keygen.mdoc.in -> BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.506 +0 -0
        Auto merged
        MERGE: 1.498.6.2
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.498.6.2 +0 -0
        Merge rename: util/ntp-keygen-opts.h -> BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.211 +0 -0
        Auto merged
        MERGE: 1.202.7.2
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.7.2 +0 -0
        Merge rename: ntpd/ntp.conf.man.in -> BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.173 +0 -0
        Auto merged
        MERGE: 1.165.6.2
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.165.6.2 +0 -0
        Merge rename: ntpd/invoke-ntp.keys.texi -> BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.211 +0 -0
        Auto merged
        MERGE: 1.202.7.2
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.7.2 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.310.6.2 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenmdoc -> BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.308 +0 -0
        Auto merged
        MERGE: 1.300.6.2
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.300.6.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitmdoc -> BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.99 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.91.5.2 +0 -0
        Merge rename: scripts/summary.1summarymdoc -> BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.310.6.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcmdoc -> BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.321 +0 -0
        Auto merged
        MERGE: 1.313.6.2
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.313.6.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqman -> BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.87 +0 -0
        Auto merged
        MERGE: 1.79.5.2
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.79.5.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.man.in -> BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.509 +0 -0
        Auto merged
        MERGE: 1.501.7.2
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.501.7.2 +0 -0
        Merge rename: ntpd/ntpd-opts.h -> BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.507 +0 -0
        Auto merged
        MERGE: 1.499.6.2
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.499.6.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.c -> BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.503 +0 -0
        Auto merged
        MERGE: 1.495.6.2
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.495.6.2 +0 -0
        Merge rename: sntp/sntp-opts.h -> BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.99 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.91.5.2 +0 -0
        Merge rename: scripts/plot_summary.man.in -> BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.310.6.2 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenman -> BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.87 +0 -0
        Auto merged
        MERGE: 1.79.6.2
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.79.6.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptracemdoc -> BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.310 +0 -0
        Auto merged
        MERGE: 1.302.6.2
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.302.6.2 +0 -0
        Merge rename: scripts/ntp-wait/invoke-ntp-wait.texi -> BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.310.6.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdman -> BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.310.6.2 +0 -0
        Merge rename: ntpdc/ntpdc.mdoc.in -> BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.310.6.2 +0 -0
        Merge rename: ntpdc/ntpdc.man.in -> BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.318 +0 -0
        Auto merged
        MERGE: 1.310.6.2
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.310.6.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.man.in -> BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.48 +0 -0
        Auto merged
        MERGE: 1.40.6.2
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.40.6.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep-opts -> BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.507 +0 -0
        Auto merged
        MERGE: 1.499.6.2
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.499.6.2 +0 -0
        Merge rename: util/ntp-keygen-opts.c -> BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.87 +0 -0
        Auto merged
        MERGE: 1.79.5.2
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.79.5.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptraceman -> BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.207 +0 -0
        Auto merged
        MERGE: 1.199.6.2
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.199.6.2 +0 -0
        Merge rename: ntpd/ntp.keys.man.in -> BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.486 +0 -0
        Auto merged
        MERGE: 1.478.6.2
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.478.6.2 +0 -0
        Merge rename: sntp/invoke-sntp.texi -> BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.504 +0 -0
        Auto merged
        MERGE: 1.496.6.2
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.496.6.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.h -> BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.159 +0 -0
        Auto merged
        MERGE: 1.151.5.2
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.151.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.html -> BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.99 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.91.5.2 +0 -0
        Merge rename: scripts/plot_summary.mdoc.in -> BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.102 +0 -0
        Auto merged
        MERGE: 1.94.5.2
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.94.5.2 +0 -0
        Merge rename: scripts/summary.html -> BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.99 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.91.5.2 +0 -0
        Merge rename: scripts/plot_summary.1plot_summarymdoc -> BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.501 +0 -0
        Auto merged
        MERGE: 1.493.6.2
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.493.6.2 +0 -0
        Merge rename: sntp/sntp.html -> BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2
    
      ChangeLog at 1.1671.1.1 +0 -0
        SCCS merged
        MERGE: 1.1593.1.40
    
      NEWS at 1.135 +0 -0
        Auto merged
        MERGE: 1.130.1.5
    
      scripts/update-leap/invoke-update-leap.texi at 1.6.1.1 +0 -1
        merge cleanup
        MERGE: 1.1.1.3
    
      scripts/update-leap/update-leap-opts at 1.6.1.1 +0 -2
        merge cleanup
        MERGE: 1.1.1.3
    
      scripts/update-leap/update-leap.1update-leapman at 1.6.1.1 +0 -3
        merge cleanup
        MERGE: 1.1.1.3
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.6.1.1 +0 -2
        merge cleanup
        MERGE: 1.1.1.3
    
      scripts/update-leap/update-leap.html at 1.6.1.1 +0 -1
        merge cleanup
        MERGE: 1.1.1.3
    
      scripts/update-leap/update-leap.man.in at 1.6.1.1 +0 -3
        merge cleanup
        MERGE: 1.1.1.3
    
      scripts/update-leap/update-leap.mdoc.in at 1.6.1.1 +0 -2
        merge cleanup
        MERGE: 1.1.1.3
    
    ChangeSet at 1.3354, 2015-04-03 12:11:11+00:00, stenn at deacon.udel.edu
      NTP_4_3_13
      TAG: NTP_4_3_13
    
      ChangeLog at 1.1672 +1 -0
        NTP_4_3_13
    
      ntpd/invoke-ntp.conf.texi at 1.15 +1 -1
        NTP_4_3_13
    
      ntpd/invoke-ntp.keys.texi at 1.15 +1 -1
        NTP_4_3_13
    
      ntpd/invoke-ntpd.texi at 1.16 +2 -2
        NTP_4_3_13
    
      ntpd/ntp.conf.5man at 1.15 +3 -3
        NTP_4_3_13
    
      ntpd/ntp.conf.5mdoc at 1.15 +2 -2
        NTP_4_3_13
    
      ntpd/ntp.conf.html at 1.15 +1 -1
        NTP_4_3_13
    
      ntpd/ntp.conf.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      ntpd/ntp.conf.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      ntpd/ntp.keys.5man at 1.15 +2 -2
        NTP_4_3_13
    
      ntpd/ntp.keys.5mdoc at 1.15 +2 -2
        NTP_4_3_13
    
      ntpd/ntp.keys.html at 1.15 +1 -1
        NTP_4_3_13
    
      ntpd/ntp.keys.man.in at 1.15 +2 -2
        NTP_4_3_13
    
      ntpd/ntp.keys.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      ntpd/ntpd-opts.c at 1.16 +7 -7
        NTP_4_3_13
    
      ntpd/ntpd-opts.h at 1.16 +3 -3
        NTP_4_3_13
    
      ntpd/ntpd.1ntpdman at 1.16 +3 -3
        NTP_4_3_13
    
      ntpd/ntpd.1ntpdmdoc at 1.16 +2 -2
        NTP_4_3_13
    
      ntpd/ntpd.html at 1.15 +2 -2
        NTP_4_3_13
    
      ntpd/ntpd.man.in at 1.16 +3 -3
        NTP_4_3_13
    
      ntpd/ntpd.mdoc.in at 1.16 +2 -2
        NTP_4_3_13
    
      ntpdc/invoke-ntpdc.texi at 1.15 +2 -2
        NTP_4_3_13
    
      ntpdc/ntpdc-opts.c at 1.15 +7 -7
        NTP_4_3_13
    
      ntpdc/ntpdc-opts.h at 1.15 +3 -3
        NTP_4_3_13
    
      ntpdc/ntpdc.1ntpdcman at 1.15 +3 -3
        NTP_4_3_13
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.15 +2 -2
        NTP_4_3_13
    
      ntpdc/ntpdc.html at 1.15 +2 -2
        NTP_4_3_13
    
      ntpdc/ntpdc.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      ntpdc/ntpdc.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      ntpq/invoke-ntpq.texi at 1.15 +2 -2
        NTP_4_3_13
    
      ntpq/ntpq-opts.c at 1.15 +7 -7
        NTP_4_3_13
    
      ntpq/ntpq-opts.h at 1.15 +3 -3
        NTP_4_3_13
    
      ntpq/ntpq.1ntpqman at 1.15 +3 -3
        NTP_4_3_13
    
      ntpq/ntpq.1ntpqmdoc at 1.15 +2 -2
        NTP_4_3_13
    
      ntpq/ntpq.html at 1.15 +2 -2
        NTP_4_3_13
    
      ntpq/ntpq.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      ntpq/ntpq.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.15 +2 -2
        NTP_4_3_13
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.15 +7 -7
        NTP_4_3_13
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.15 +3 -3
        NTP_4_3_13
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.15 +3 -3
        NTP_4_3_13
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.15 +2 -2
        NTP_4_3_13
    
      ntpsnmpd/ntpsnmpd.html at 1.15 +1 -1
        NTP_4_3_13
    
      ntpsnmpd/ntpsnmpd.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      packageinfo.sh at 1.15 +1 -1
        NTP_4_3_13
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/calc_tickadj/calc_tickadj.html at 1.15 +1 -1
        NTP_4_3_13
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.15 +1 -1
        NTP_4_3_13
    
      scripts/invoke-plot_summary.texi at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/invoke-summary.texi at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntp-wait/ntp-wait-opts at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntp-wait/ntp-wait.html at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntp-wait/ntp-wait.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntpsweep/ntpsweep-opts at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntpsweep/ntpsweep.html at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntpsweep/ntpsweep.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntptrace/ntptrace-opts at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntptrace/ntptrace.html at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/ntptrace/ntptrace.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/plot_summary-opts at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/plot_summary.1plot_summaryman at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/plot_summary.1plot_summarymdoc at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/plot_summary.html at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/plot_summary.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/plot_summary.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/summary-opts at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/summary.1summaryman at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/summary.1summarymdoc at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/summary.html at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/summary.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      scripts/summary.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      scripts/update-leap/invoke-update-leap.texi at 1.7 +1 -1
        NTP_4_3_13
    
      scripts/update-leap/update-leap-opts at 1.7 +2 -2
        NTP_4_3_13
    
      scripts/update-leap/update-leap.1update-leapman at 1.7 +3 -3
        NTP_4_3_13
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.7 +2 -2
        NTP_4_3_13
    
      scripts/update-leap/update-leap.html at 1.7 +1 -1
        NTP_4_3_13
    
      scripts/update-leap/update-leap.man.in at 1.7 +3 -3
        NTP_4_3_13
    
      scripts/update-leap/update-leap.mdoc.in at 1.7 +2 -2
        NTP_4_3_13
    
      sntp/invoke-sntp.texi at 1.15 +2 -2
        NTP_4_3_13
    
      sntp/sntp-opts.c at 1.15 +7 -7
        NTP_4_3_13
    
      sntp/sntp-opts.h at 1.15 +3 -3
        NTP_4_3_13
    
      sntp/sntp.1sntpman at 1.15 +3 -3
        NTP_4_3_13
    
      sntp/sntp.1sntpmdoc at 1.15 +2 -2
        NTP_4_3_13
    
      sntp/sntp.html at 1.15 +2 -2
        NTP_4_3_13
    
      sntp/sntp.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      sntp/sntp.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
      util/invoke-ntp-keygen.texi at 1.15 +2 -2
        NTP_4_3_13
    
      util/ntp-keygen-opts.c at 1.15 +7 -7
        NTP_4_3_13
    
      util/ntp-keygen-opts.h at 1.15 +3 -3
        NTP_4_3_13
    
      util/ntp-keygen.1ntp-keygenman at 1.15 +3 -3
        NTP_4_3_13
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.15 +2 -2
        NTP_4_3_13
    
      util/ntp-keygen.html at 1.15 +2 -2
        NTP_4_3_13
    
      util/ntp-keygen.man.in at 1.15 +3 -3
        NTP_4_3_13
    
      util/ntp-keygen.mdoc.in at 1.15 +2 -2
        NTP_4_3_13
    
    ChangeSet at 1.3353, 2015-04-03 08:36:22+00:00, stenn at psp-fb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1671 +2 -0
        merge cleanup
    
    ChangeSet at 1.3352, 2015-04-03 08:33:07+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.25.3
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.210 +0 -0
        Auto merged
        MERGE: 1.202.6.2
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.6.2 +0 -0
        Merge rename: ntpd/ntp.conf.5man -> BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.83 +0 -0
        Auto merged
        MERGE: 1.76.4.2
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.76.4.2 +0 -0
        Merge rename: scripts/calc_tickadj/invoke-calc_tickadj.texi -> BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.79 +0 -0
        Auto merged
        MERGE: 1.72.5.2
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.72.5.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc -> BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.206 +0 -0
        Auto merged
        MERGE: 1.199.5.2
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.199.5.2 +0 -0
        Merge rename: ntpd/ntp.keys.5mdoc -> BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.100 +0 -0
        Auto merged
        MERGE: 1.93.4.2
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.93.4.2 +0 -0
        Merge rename: scripts/invoke-plot_summary.texi -> BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.79.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepmdoc -> BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.87 +0 -0
        Auto merged
        MERGE: 1.80.4.2
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.80.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.mdoc.in -> BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.310.5.2 +0 -0
        Merge rename: ntpd/ntpd.man.in -> BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.101 +0 -0
        Auto merged
        MERGE: 1.94.4.2
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.94.4.2 +0 -0
        Merge rename: scripts/plot_summary.html -> BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.507 +0 -0
        Auto merged
        MERGE: 1.500.5.2
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.500.5.2 +0 -0
        Merge rename: ntpq/ntpq-opts.h -> BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.91.4.2 +0 -0
        Merge rename: scripts/plot_summary.1plot_summaryman -> BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.47 +0 -0
        Auto merged
        MERGE: 1.40.5.2
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.40.5.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace-opts -> BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.47 +0 -0
        Auto merged
        MERGE: 1.40.5.2
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.40.5.2 +0 -0
        Merge rename: scripts/summary-opts -> BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.313.5.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqmdoc -> BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.206 +0 -0
        Auto merged
        MERGE: 1.199.5.2
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.199.5.2 +0 -0
        Merge rename: ntpd/ntp.keys.mdoc.in -> BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.81 +0 -0
        Auto merged
        MERGE: 1.74.4.2
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.74.4.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.html -> BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.79 +0 -0
        Auto merged
        MERGE: 1.72.5.2
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.72.5.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.mdoc.in -> BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.505 +0 -0
        Auto merged
        MERGE: 1.498.5.2
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.498.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.h -> BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.504 +0 -0
        Auto merged
        MERGE: 1.497.5.2
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.497.5.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.c -> BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.313.5.2 +0 -0
        Merge rename: sntp/sntp.1sntpman -> BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.160 +0 -0
        Auto merged
        MERGE: 1.153.4.2
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.153.4.2 +0 -0
        Merge rename: ntpq/ntpq.html -> BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.310.5.2 +0 -0
        Merge rename: util/ntp-keygen.man.in -> BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.47 +0 -0
        Auto merged
        MERGE: 1.40.5.2
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.40.5.2 +0 -0
        Merge rename: scripts/plot_summary-opts -> BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.78 +0 -0
        Auto merged
        MERGE: 1.71.4.2
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.71.4.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.man.in -> BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.5.2
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.91.5.2 +0 -0
        Merge rename: scripts/ntptrace/invoke-ntptrace.texi -> BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.206 +0 -0
        Auto merged
        MERGE: 1.199.5.2
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.199.5.2 +0 -0
        Merge rename: ntpd/ntp.keys.5man -> BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.509 +0 -0
        Auto merged
        MERGE: 1.502.5.2
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.502.5.2 +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.87 +0 -0
        Auto merged
        MERGE: 1.80.5.2
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.80.5.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.mdoc.in -> BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.310.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc -> BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.503 +0 -1
        Merge cleanup
        MERGE: 1.492.4.2
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.492.4.2 +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.100 +0 -0
        Auto merged
        MERGE: 1.93.4.2
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.93.4.2 +0 -0
        Merge rename: scripts/invoke-summary.texi -> BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.310.5.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcman -> BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.503 +0 -0
        Auto merged
        MERGE: 1.496.5.2
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.496.5.2 +0 -0
        Merge rename: sntp/sntp-opts.c -> BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.313.5.2 +0 -0
        Merge rename: sntp/sntp.mdoc.in -> BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.310.5.2 +0 -0
        Merge rename: ntpd/ntpd.1ntpdman -> BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.310.5.2 +0 -0
        Merge rename: ntpd/ntpd.mdoc.in -> BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.330 +0 -0
        Auto merged
        MERGE: 1.323.5.2
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.323.5.2 +0 -0
        Merge rename: ntpdc/ntpdc.html -> BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.79 +0 -0
        Auto merged
        MERGE: 1.72.4.2
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.72.4.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjman -> BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.326 +0 -0
        Auto merged
        MERGE: 1.319.5.2
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.319.5.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.html -> BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.91.4.2 +0 -0
        Merge rename: scripts/summary.1summaryman -> BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.91.4.2 +0 -0
        Merge rename: scripts/summary.mdoc.in -> BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.313.5.2 +0 -0
        Merge rename: sntp/sntp.1sntpmdoc -> BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.310.5.2 +0 -0
        Merge rename: ntpd/ntpd.1ntpdmdoc -> BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.164 +0 -0
        Auto merged
        MERGE: 1.157.4.2
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.157.4.2 +0 -0
        Merge rename: util/ntp-keygen.html -> BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.313.5.2 +0 -0
        Merge rename: ntpq/ntpq.man.in -> BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.79.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepman -> BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.91.4.2 +0 -0
        Merge rename: scripts/ntpsweep/invoke-ntpsweep.texi -> BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.313.5.2 +0 -0
        Merge rename: sntp/sntp.man.in -> BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.99 +0 -0
        Auto merged
        MERGE: 1.92.4.2
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.92.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.html -> BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.486 +0 -0
        Auto merged
        MERGE: 1.479.5.2
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.479.5.2 +0 -0
        Merge rename: ntpdc/invoke-ntpdc.texi -> BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.79.4.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.man.in -> BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.489 +0 -0
        Auto merged
        MERGE: 1.482.5.2
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.482.5.2 +0 -0
        Merge rename: util/invoke-ntp-keygen.texi -> BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.492 +0 -0
        Auto merged
        MERGE: 1.485.5.2
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.485.5.2 +0 -0
        Merge rename: ntpq/invoke-ntpq.texi -> BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.168 +0 -0
        Auto merged
        MERGE: 1.161.4.2
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.161.4.2 +0 -0
        Merge rename: ntpd/ntp.conf.html -> BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.488 +0 -0
        Auto merged
        MERGE: 1.481.5.2
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.481.5.2 +0 -0
        Merge rename: ntpsnmpd/invoke-ntpsnmpd.texi -> BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.99 +0 -0
        Auto merged
        MERGE: 1.92.5.2
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.92.5.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.html -> BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.488 +0 -0
        Auto merged
        MERGE: 1.481.5.2
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.481.5.2 +0 -0
        Merge rename: ntpd/invoke-ntpd.texi -> BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.310.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.mdoc.in -> BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.169 +0 -0
        Auto merged
        MERGE: 1.162.4.2
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.162.4.2 +0 -0
        Merge rename: ntpd/ntp.keys.html -> BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.307 +0 -0
        Auto merged
        MERGE: 1.300.5.2
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.300.5.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.mdoc.in -> BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.307 +0 -0
        Auto merged
        MERGE: 1.300.4.2
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.300.4.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.man.in -> BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.210 +0 -0
        Auto merged
        MERGE: 1.202.6.2
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.6.2 +0 -0
        Merge rename: ntpd/ntp.conf.mdoc.in -> BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.45 +0 -0
        Auto merged
        MERGE: 1.38.5.2
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.38.5.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait-opts -> BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.313.5.2 +0 -0
        Merge rename: ntpq/ntpq.mdoc.in -> BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.163 +0 -0
        Auto merged
        MERGE: 1.156.4.2
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.156.4.2 +0 -0
        Merge rename: ntpd/ntpd.html -> BitKeeper/deleted/93/ntpd.html~fab305284d96b809
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.176 +0 -0
        Auto merged
        MERGE: 1.168.6.2
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.6.2 +0 -0
        Merge rename: ntpd/invoke-ntp.conf.texi -> BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.91.4.2 +0 -0
        Merge rename: scripts/summary.man.in -> BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.509 +0 -0
        Auto merged
        MERGE: 1.502.6.2
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.502.6.2 +0 -0
        Merge rename: ntpd/ntpd-opts.c -> BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.307 +0 -0
        Auto merged
        MERGE: 1.300.4.2
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.300.4.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitman -> BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.310.5.2 +0 -0
        Merge rename: util/ntp-keygen.mdoc.in -> BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.505 +0 -0
        Auto merged
        MERGE: 1.498.5.2
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.498.5.2 +0 -0
        Merge rename: util/ntp-keygen-opts.h -> BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.210 +0 -0
        Auto merged
        MERGE: 1.202.6.2
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.6.2 +0 -0
        Merge rename: ntpd/ntp.conf.man.in -> BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.172 +0 -0
        Auto merged
        MERGE: 1.165.5.2
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.165.5.2 +0 -0
        Merge rename: ntpd/invoke-ntp.keys.texi -> BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.210 +0 -0
        Auto merged
        MERGE: 1.202.6.2
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.6.2 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.310.5.2 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenmdoc -> BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.307 +0 -0
        Auto merged
        MERGE: 1.300.5.2
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.300.5.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitmdoc -> BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.91.4.2 +0 -0
        Merge rename: scripts/summary.1summarymdoc -> BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.310.5.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcmdoc -> BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.320 +0 -0
        Auto merged
        MERGE: 1.313.5.2
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.313.5.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqman -> BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.79.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.man.in -> BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.508 +0 -0
        Auto merged
        MERGE: 1.501.6.2
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.501.6.2 +0 -0
        Merge rename: ntpd/ntpd-opts.h -> BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.506 +0 -0
        Auto merged
        MERGE: 1.499.5.2
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.499.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.c -> BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.502 +0 -0
        Auto merged
        MERGE: 1.495.5.2
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.495.5.2 +0 -0
        Merge rename: sntp/sntp-opts.h -> BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.91.4.2 +0 -0
        Merge rename: scripts/plot_summary.man.in -> BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.310.5.2 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenman -> BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.5.2
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.79.5.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptracemdoc -> BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.309 +0 -0
        Auto merged
        MERGE: 1.302.5.2
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.302.5.2 +0 -0
        Merge rename: scripts/ntp-wait/invoke-ntp-wait.texi -> BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.310.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdman -> BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.310.5.2 +0 -0
        Merge rename: ntpdc/ntpdc.mdoc.in -> BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.310.5.2 +0 -0
        Merge rename: ntpdc/ntpdc.man.in -> BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.317 +0 -0
        Auto merged
        MERGE: 1.310.5.2
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.310.5.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.man.in -> BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.47 +0 -0
        Auto merged
        MERGE: 1.40.5.2
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.40.5.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep-opts -> BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.506 +0 -0
        Auto merged
        MERGE: 1.499.5.2
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.499.5.2 +0 -0
        Merge rename: util/ntp-keygen-opts.c -> BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.86 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.79.4.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptraceman -> BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.206 +0 -0
        Auto merged
        MERGE: 1.199.5.2
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.199.5.2 +0 -0
        Merge rename: ntpd/ntp.keys.man.in -> BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.485 +0 -0
        Auto merged
        MERGE: 1.478.5.2
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.478.5.2 +0 -0
        Merge rename: sntp/invoke-sntp.texi -> BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.503 +0 -0
        Auto merged
        MERGE: 1.496.5.2
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.496.5.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.h -> BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.158 +0 -0
        Auto merged
        MERGE: 1.151.4.2
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.151.4.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.html -> BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.91.4.2 +0 -0
        Merge rename: scripts/plot_summary.mdoc.in -> BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.101 +0 -0
        Auto merged
        MERGE: 1.94.4.2
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.94.4.2 +0 -0
        Merge rename: scripts/summary.html -> BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.98 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.91.4.2 +0 -0
        Merge rename: scripts/plot_summary.1plot_summarymdoc -> BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.500 +0 -0
        Auto merged
        MERGE: 1.493.5.2
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.493.5.2 +0 -0
        Merge rename: sntp/sntp.html -> BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2
    
      ChangeLog at 1.1670 +0 -0
        Auto merged
        MERGE: 1.1593.25.3
    
      scripts/update-leap/invoke-update-leap.texi at 1.6 +0 -1
        Merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap-opts at 1.6 +0 -2
        merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap.1update-leapman at 1.6 +0 -3
        merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.6 +0 -1
        merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap.html at 1.6 +0 -6
        merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap.man.in at 1.6 +0 -3
        merge cleanup
        MERGE: 1.1.1.2
    
      scripts/update-leap/update-leap.mdoc.in at 1.6 +0 -1
        merge cleanup
        MERGE: 1.1.1.2
    
    ChangeSet at 1.3351, 2015-04-03 02:16:16-04:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.25.1
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.209 +0 -0
        Auto merged
        MERGE: 1.202.5.2
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.5.2 +0 -0
        Merge rename: ntpd/ntp.conf.5man -> BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.82 +0 -0
        Auto merged
        MERGE: 1.76.3.2
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.76.3.2 +0 -0
        Merge rename: scripts/calc_tickadj/invoke-calc_tickadj.texi -> BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.78 +0 -0
        Auto merged
        MERGE: 1.72.4.2
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.72.4.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc -> BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.205 +0 -0
        Auto merged
        MERGE: 1.199.4.2
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.199.4.2 +0 -0
        Merge rename: ntpd/ntp.keys.5mdoc -> BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.99 +0 -0
        Auto merged
        MERGE: 1.93.3.2
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.93.3.2 +0 -0
        Merge rename: scripts/invoke-plot_summary.texi -> BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.85 +0 -0
        Auto merged
        MERGE: 1.79.3.2
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.79.3.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepmdoc -> BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.86 +0 -0
        Auto merged
        MERGE: 1.80.3.2
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.80.3.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.mdoc.in -> BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.310.4.2 +0 -0
        Merge rename: ntpd/ntpd.man.in -> BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.100 +0 -0
        Auto merged
        MERGE: 1.94.3.2
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.94.3.2 +0 -0
        Merge rename: scripts/plot_summary.html -> BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.506 +0 -0
        Auto merged
        MERGE: 1.500.4.2
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.500.4.2 +0 -0
        Merge rename: ntpq/ntpq-opts.h -> BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.97 +0 -0
        Auto merged
        MERGE: 1.91.3.2
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.91.3.2 +0 -0
        Merge rename: scripts/plot_summary.1plot_summaryman -> BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.46 +0 -0
        Auto merged
        MERGE: 1.40.4.2
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.40.4.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace-opts -> BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.46 +0 -0
        Auto merged
        MERGE: 1.40.4.2
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.40.4.2 +0 -0
        Merge rename: scripts/summary-opts -> BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.319 +0 -0
        Auto merged
        MERGE: 1.313.4.2
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.313.4.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqmdoc -> BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.205 +0 -0
        Auto merged
        MERGE: 1.199.4.2
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.199.4.2 +0 -0
        Merge rename: ntpd/ntp.keys.mdoc.in -> BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.80 +0 -0
        Auto merged
        MERGE: 1.74.3.2
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.74.3.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.html -> BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.78 +0 -0
        Auto merged
        MERGE: 1.72.4.2
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.72.4.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.mdoc.in -> BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.504 +0 -0
        Auto merged
        MERGE: 1.498.4.2
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.498.4.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.h -> BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.503 +0 -0
        Auto merged
        MERGE: 1.497.4.2
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.497.4.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.c -> BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.319 +0 -0
        Auto merged
        MERGE: 1.313.4.2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.313.4.2 +0 -0
        Merge rename: sntp/sntp.1sntpman -> BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.159 +0 -0
        Auto merged
        MERGE: 1.153.3.2
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.153.3.2 +0 -0
        Merge rename: ntpq/ntpq.html -> BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.310.4.2 +0 -0
        Merge rename: util/ntp-keygen.man.in -> BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.46 +0 -0
        Auto merged
        MERGE: 1.40.4.2
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.40.4.2 +0 -0
        Merge rename: scripts/plot_summary-opts -> BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.77 +0 -0
        Auto merged
        MERGE: 1.71.3.2
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.71.3.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.man.in -> BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.97 +0 -0
        Auto merged
        MERGE: 1.91.4.2
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.91.4.2 +0 -0
        Merge rename: scripts/ntptrace/invoke-ntptrace.texi -> BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.205 +0 -0
        Auto merged
        MERGE: 1.199.4.2
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.199.4.2 +0 -0
        Merge rename: ntpd/ntp.keys.5man -> BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.508 +0 -0
        Auto merged
        MERGE: 1.502.4.2
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.502.4.2 +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.86 +0 -0
        Auto merged
        MERGE: 1.80.4.2
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.80.4.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.mdoc.in -> BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.310.4.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc -> BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.502 +0 -1
        Merge cleanup
        MERGE: 1.492.3.2
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.492.3.2 +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.99 +0 -0
        Auto merged
        MERGE: 1.93.3.2
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.93.3.2 +0 -0
        Merge rename: scripts/invoke-summary.texi -> BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.310.4.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcman -> BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.502 +0 -0
        Auto merged
        MERGE: 1.496.4.2
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.496.4.2 +0 -0
        Merge rename: sntp/sntp-opts.c -> BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.319 +0 -0
        Auto merged
        MERGE: 1.313.4.2
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.313.4.2 +0 -0
        Merge rename: sntp/sntp.mdoc.in -> BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.310.4.2 +0 -0
        Merge rename: ntpd/ntpd.1ntpdman -> BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.310.4.2 +0 -0
        Merge rename: ntpd/ntpd.mdoc.in -> BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.329 +0 -0
        Auto merged
        MERGE: 1.323.4.2
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.323.4.2 +0 -0
        Merge rename: ntpdc/ntpdc.html -> BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.78 +0 -0
        Auto merged
        MERGE: 1.72.3.2
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.72.3.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjman -> BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.325 +0 -0
        Auto merged
        MERGE: 1.319.4.2
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.319.4.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.html -> BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.97 +0 -0
        Auto merged
        MERGE: 1.91.3.2
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.91.3.2 +0 -0
        Merge rename: scripts/summary.1summaryman -> BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.97 +0 -0
        Auto merged
        MERGE: 1.91.3.2
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.91.3.2 +0 -0
        Merge rename: scripts/summary.mdoc.in -> BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.319 +0 -0
        Auto merged
        MERGE: 1.313.4.2
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.313.4.2 +0 -0
        Merge rename: sntp/sntp.1sntpmdoc -> BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.310.4.2 +0 -0
        Merge rename: ntpd/ntpd.1ntpdmdoc -> BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.163 +0 -0
        Auto merged
        MERGE: 1.157.3.2
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.157.3.2 +0 -0
        Merge rename: util/ntp-keygen.html -> BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.319 +0 -0
        Auto merged
        MERGE: 1.313.4.2
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.313.4.2 +0 -0
        Merge rename: ntpq/ntpq.man.in -> BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.85 +0 -0
        Auto merged
        MERGE: 1.79.3.2
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.79.3.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepman -> BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.97 +0 -0
        Auto merged
        MERGE: 1.91.3.2
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.91.3.2 +0 -0
        Merge rename: scripts/ntpsweep/invoke-ntpsweep.texi -> BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.319 +0 -0
        Auto merged
        MERGE: 1.313.4.2
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.313.4.2 +0 -0
        Merge rename: sntp/sntp.man.in -> BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.98 +0 -0
        Auto merged
        MERGE: 1.92.3.2
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.92.3.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.html -> BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.485 +0 -0
        Auto merged
        MERGE: 1.479.4.2
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.479.4.2 +0 -0
        Merge rename: ntpdc/invoke-ntpdc.texi -> BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.85 +0 -0
        Auto merged
        MERGE: 1.79.3.2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.79.3.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.man.in -> BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.488 +0 -0
        Auto merged
        MERGE: 1.482.4.2
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.482.4.2 +0 -0
        Merge rename: util/invoke-ntp-keygen.texi -> BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.491 +0 -0
        Auto merged
        MERGE: 1.485.4.2
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.485.4.2 +0 -0
        Merge rename: ntpq/invoke-ntpq.texi -> BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.167 +0 -0
        Auto merged
        MERGE: 1.161.3.2
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.161.3.2 +0 -0
        Merge rename: ntpd/ntp.conf.html -> BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.487 +0 -0
        Auto merged
        MERGE: 1.481.4.2
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.481.4.2 +0 -0
        Merge rename: ntpsnmpd/invoke-ntpsnmpd.texi -> BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.98 +0 -0
        Auto merged
        MERGE: 1.92.4.2
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.92.4.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.html -> BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.487 +0 -0
        Auto merged
        MERGE: 1.481.4.2
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.481.4.2 +0 -0
        Merge rename: ntpd/invoke-ntpd.texi -> BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.310.4.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.mdoc.in -> BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.168 +0 -0
        Auto merged
        MERGE: 1.162.3.2
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.162.3.2 +0 -0
        Merge rename: ntpd/ntp.keys.html -> BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.306 +0 -0
        Auto merged
        MERGE: 1.300.4.2
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.300.4.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.mdoc.in -> BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.306 +0 -0
        Auto merged
        MERGE: 1.300.3.2
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.300.3.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.man.in -> BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.209 +0 -0
        Auto merged
        MERGE: 1.202.5.2
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.5.2 +0 -0
        Merge rename: ntpd/ntp.conf.mdoc.in -> BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.44 +0 -0
        Auto merged
        MERGE: 1.38.4.2
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.38.4.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait-opts -> BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.319 +0 -0
        Auto merged
        MERGE: 1.313.4.2
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.313.4.2 +0 -0
        Merge rename: ntpq/ntpq.mdoc.in -> BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.162 +0 -0
        Auto merged
        MERGE: 1.156.3.2
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.156.3.2 +0 -0
        Merge rename: ntpd/ntpd.html -> BitKeeper/deleted/93/ntpd.html~fab305284d96b809
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.175 +0 -0
        Auto merged
        MERGE: 1.168.5.2
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.5.2 +0 -0
        Merge rename: ntpd/invoke-ntp.conf.texi -> BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.97 +0 -0
        Auto merged
        MERGE: 1.91.3.2
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.91.3.2 +0 -0
        Merge rename: scripts/summary.man.in -> BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.508 +0 -0
        Auto merged
        MERGE: 1.502.5.2
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.502.5.2 +0 -0
        Merge rename: ntpd/ntpd-opts.c -> BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.306 +0 -0
        Auto merged
        MERGE: 1.300.3.2
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.300.3.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitman -> BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.310.4.2 +0 -0
        Merge rename: util/ntp-keygen.mdoc.in -> BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.504 +0 -0
        Auto merged
        MERGE: 1.498.4.2
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.498.4.2 +0 -0
        Merge rename: util/ntp-keygen-opts.h -> BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.209 +0 -0
        Auto merged
        MERGE: 1.202.5.2
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.5.2 +0 -0
        Merge rename: ntpd/ntp.conf.man.in -> BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.171 +0 -0
        Auto merged
        MERGE: 1.165.4.2
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.165.4.2 +0 -0
        Merge rename: ntpd/invoke-ntp.keys.texi -> BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.209 +0 -0
        Auto merged
        MERGE: 1.202.5.2
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.5.2 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.310.4.2 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenmdoc -> BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.306 +0 -0
        Auto merged
        MERGE: 1.300.4.2
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.300.4.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitmdoc -> BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.97 +0 -0
        Auto merged
        MERGE: 1.91.3.2
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.91.3.2 +0 -0
        Merge rename: scripts/summary.1summarymdoc -> BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.310.4.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcmdoc -> BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.319 +0 -0
        Auto merged
        MERGE: 1.313.4.2
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.313.4.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqman -> BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.85 +0 -0
        Auto merged
        MERGE: 1.79.3.2
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.79.3.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.man.in -> BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.507 +0 -0
        Auto merged
        MERGE: 1.501.5.2
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.501.5.2 +0 -0
        Merge rename: ntpd/ntpd-opts.h -> BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.505 +0 -0
        Auto merged
        MERGE: 1.499.4.2
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.499.4.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.c -> BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.501 +0 -0
        Auto merged
        MERGE: 1.495.4.2
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.495.4.2 +0 -0
        Merge rename: sntp/sntp-opts.h -> BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.97 +0 -0
        Auto merged
        MERGE: 1.91.3.2
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.91.3.2 +0 -0
        Merge rename: scripts/plot_summary.man.in -> BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.310.4.2 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenman -> BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.85 +0 -0
        Auto merged
        MERGE: 1.79.4.2
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.79.4.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptracemdoc -> BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.308 +0 -0
        Auto merged
        MERGE: 1.302.4.2
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.302.4.2 +0 -0
        Merge rename: scripts/ntp-wait/invoke-ntp-wait.texi -> BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.310.4.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdman -> BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.310.4.2 +0 -0
        Merge rename: ntpdc/ntpdc.mdoc.in -> BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.310.4.2 +0 -0
        Merge rename: ntpdc/ntpdc.man.in -> BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.316 +0 -0
        Auto merged
        MERGE: 1.310.4.2
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.310.4.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.man.in -> BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.46 +0 -0
        Auto merged
        MERGE: 1.40.4.2
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.40.4.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep-opts -> BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.505 +0 -0
        Auto merged
        MERGE: 1.499.4.2
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.499.4.2 +0 -0
        Merge rename: util/ntp-keygen-opts.c -> BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.85 +0 -0
        Auto merged
        MERGE: 1.79.3.2
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.79.3.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptraceman -> BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.205 +0 -0
        Auto merged
        MERGE: 1.199.4.2
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.199.4.2 +0 -0
        Merge rename: ntpd/ntp.keys.man.in -> BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.484 +0 -0
        Auto merged
        MERGE: 1.478.4.2
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.478.4.2 +0 -0
        Merge rename: sntp/invoke-sntp.texi -> BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.502 +0 -0
        Auto merged
        MERGE: 1.496.4.2
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.496.4.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.h -> BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.157 +0 -0
        Auto merged
        MERGE: 1.151.3.2
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.151.3.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.html -> BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.97 +0 -0
        Auto merged
        MERGE: 1.91.3.2
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.91.3.2 +0 -0
        Merge rename: scripts/plot_summary.mdoc.in -> BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.100 +0 -0
        Auto merged
        MERGE: 1.94.3.2
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.94.3.2 +0 -0
        Merge rename: scripts/summary.html -> BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.97 +0 -0
        Auto merged
        MERGE: 1.91.3.2
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.91.3.2 +0 -0
        Merge rename: scripts/plot_summary.1plot_summarymdoc -> BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.499 +0 -0
        Auto merged
        MERGE: 1.493.4.2
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.493.4.2 +0 -0
        Merge rename: sntp/sntp.html -> BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2
    
      ChangeLog at 1.1669 +0 -0
        Auto merged
        MERGE: 1.1593.25.1
    
      NEWS at 1.134 +0 -0
        Auto merged
        MERGE: 1.130.1.3
    
      scripts/update-leap/invoke-update-leap.texi at 1.5 +0 -6
        Merge cleanup
        MERGE: 1.1.1.1
    
      scripts/update-leap/update-leap-opts at 1.5 +0 -2
        Merge cleanup
        MERGE: 1.1.1.1
    
      scripts/update-leap/update-leap.1update-leapman at 1.5 +0 -7
        Merge cleanup
        MERGE: 1.1.1.1
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.5 +0 -6
        Merge cleanup
        MERGE: 1.1.1.1
    
      scripts/update-leap/update-leap.html at 1.5 +0 -48
        Merge cleanup
        MERGE: 1.1.1.1
    
      scripts/update-leap/update-leap.man.in at 1.5 +0 -7
        Merge cleanup
        MERGE: 1.1.1.1
    
      scripts/update-leap/update-leap.mdoc.in at 1.5 +0 -6
        Merge cleanup
        MERGE: 1.1.1.1
    
    ChangeSet at 1.3350, 2015-04-03 00:34:59+00:00, stenn at psp-deb1.ntp.org
      Merge bk://bk.ntp.org/ntp-dev
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.3347.1.2
    
      ChangeLog at 1.1668 +0 -0
        Auto merged
        MERGE: 1.1665.1.2
    
    ChangeSet at 1.3347.1.2, 2015-04-02 20:29:52-04:00, stenn at deacon.udel.edu
      [Bug 2795] fixed some minor warnings
    
      ChangeLog at 1.1665.1.2 +1 -0
        [Bug 2795] fixed some minor warnings
    
    ChangeSet at 1.3347.1.1, 2015-04-02 20:22:05-04:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.20.11
    
      ChangeLog at 1.1665.1.1 +0 -0
        Auto merged
        MERGE: 1.1593.20.9
    
    ChangeSet at 1.3349, 2015-04-02 21:52:34+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.3265.20.11
    
      ChangeLog at 1.1667 +0 -0
        Auto merged
        MERGE: 1.1593.20.9
    
    ChangeSet at 1.3348, 2015-04-02 21:44:50+00:00, stenn at psp-deb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1666 +1 -0
        merge cleanup
    
    ChangeSet at 1.3347, 2015-04-02 09:15:03+00:00, stenn at deacon.udel.edu
      NTP_4_3_12
      TAG: NTP_4_3_12
    
      ChangeLog at 1.1665 +1 -0
        NTP_4_3_12
    
      ntpd/invoke-ntp.conf.texi at 1.14 +1 -1
        NTP_4_3_12
    
      ntpd/invoke-ntp.keys.texi at 1.14 +1 -1
        NTP_4_3_12
    
      ntpd/invoke-ntpd.texi at 1.15 +2 -2
        NTP_4_3_12
    
      ntpd/ntp.conf.5man at 1.14 +3 -3
        NTP_4_3_12
    
      ntpd/ntp.conf.5mdoc at 1.14 +2 -2
        NTP_4_3_12
    
      ntpd/ntp.conf.html at 1.14 +1 -1
        NTP_4_3_12
    
      ntpd/ntp.conf.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      ntpd/ntp.conf.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      ntpd/ntp.keys.5man at 1.14 +2 -2
        NTP_4_3_12
    
      ntpd/ntp.keys.5mdoc at 1.14 +2 -2
        NTP_4_3_12
    
      ntpd/ntp.keys.html at 1.14 +1 -1
        NTP_4_3_12
    
      ntpd/ntp.keys.man.in at 1.14 +2 -2
        NTP_4_3_12
    
      ntpd/ntp.keys.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      ntpd/ntpd-opts.c at 1.15 +7 -7
        NTP_4_3_12
    
      ntpd/ntpd-opts.h at 1.15 +3 -3
        NTP_4_3_12
    
      ntpd/ntpd.1ntpdman at 1.15 +3 -3
        NTP_4_3_12
    
      ntpd/ntpd.1ntpdmdoc at 1.15 +1 -1
        NTP_4_3_12
    
      ntpd/ntpd.html at 1.14 +50 -26
        NTP_4_3_12
    
      ntpd/ntpd.man.in at 1.15 +3 -3
        NTP_4_3_12
    
      ntpd/ntpd.mdoc.in at 1.15 +1 -1
        NTP_4_3_12
    
      ntpdc/invoke-ntpdc.texi at 1.14 +2 -2
        NTP_4_3_12
    
      ntpdc/ntpdc-opts.c at 1.14 +7 -7
        NTP_4_3_12
    
      ntpdc/ntpdc-opts.h at 1.14 +3 -3
        NTP_4_3_12
    
      ntpdc/ntpdc.1ntpdcman at 1.14 +3 -3
        NTP_4_3_12
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.14 +2 -2
        NTP_4_3_12
    
      ntpdc/ntpdc.html at 1.14 +2 -2
        NTP_4_3_12
    
      ntpdc/ntpdc.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      ntpdc/ntpdc.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      ntpq/invoke-ntpq.texi at 1.14 +2 -2
        NTP_4_3_12
    
      ntpq/ntpq-opts.c at 1.14 +7 -7
        NTP_4_3_12
    
      ntpq/ntpq-opts.h at 1.14 +3 -3
        NTP_4_3_12
    
      ntpq/ntpq.1ntpqman at 1.14 +3 -3
        NTP_4_3_12
    
      ntpq/ntpq.1ntpqmdoc at 1.14 +2 -2
        NTP_4_3_12
    
      ntpq/ntpq.html at 1.14 +2 -2
        NTP_4_3_12
    
      ntpq/ntpq.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      ntpq/ntpq.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.14 +2 -2
        NTP_4_3_12
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.14 +7 -7
        NTP_4_3_12
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.14 +3 -3
        NTP_4_3_12
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.14 +3 -3
        NTP_4_3_12
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.14 +2 -2
        NTP_4_3_12
    
      ntpsnmpd/ntpsnmpd.html at 1.14 +1 -1
        NTP_4_3_12
    
      ntpsnmpd/ntpsnmpd.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      packageinfo.sh at 1.14 +1 -1
        NTP_4_3_12
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/calc_tickadj/calc_tickadj.html at 1.14 +1 -1
        NTP_4_3_12
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.14 +1 -1
        NTP_4_3_12
    
      scripts/invoke-plot_summary.texi at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/invoke-summary.texi at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntp-wait/ntp-wait-opts at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntp-wait/ntp-wait.html at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntp-wait/ntp-wait.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntpsweep/ntpsweep-opts at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntpsweep/ntpsweep.html at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntpsweep/ntpsweep.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntptrace/ntptrace-opts at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntptrace/ntptrace.html at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/ntptrace/ntptrace.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/plot_summary-opts at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/plot_summary.1plot_summaryman at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/plot_summary.1plot_summarymdoc at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/plot_summary.html at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/plot_summary.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/plot_summary.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/summary-opts at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/summary.1summaryman at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/summary.1summarymdoc at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/summary.html at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/summary.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      scripts/summary.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
      scripts/update-leap/invoke-update-leap.texi at 1.4 +1 -1
        NTP_4_3_12
    
      scripts/update-leap/update-leap-opts at 1.4 +2 -2
        NTP_4_3_12
    
      scripts/update-leap/update-leap.1update-leapman at 1.4 +3 -3
        NTP_4_3_12
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.4 +2 -2
        NTP_4_3_12
    
      scripts/update-leap/update-leap.html at 1.4 +6 -5
        NTP_4_3_12
    
      scripts/update-leap/update-leap.man.in at 1.4 +3 -3
        NTP_4_3_12
    
      scripts/update-leap/update-leap.mdoc.in at 1.4 +2 -2
        NTP_4_3_12
    
      sntp/invoke-sntp.texi at 1.14 +4 -3
        NTP_4_3_12
    
      sntp/sntp-opts.c at 1.14 +7 -7
        NTP_4_3_12
    
      sntp/sntp-opts.h at 1.14 +3 -3
        NTP_4_3_12
    
      sntp/sntp.1sntpman at 1.14 +5 -4
        NTP_4_3_12
    
      sntp/sntp.1sntpmdoc at 1.14 +4 -3
        NTP_4_3_12
    
      sntp/sntp.html at 1.14 +4 -3
        NTP_4_3_12
    
      sntp/sntp.man.in at 1.14 +5 -4
        NTP_4_3_12
    
      sntp/sntp.mdoc.in at 1.14 +4 -3
        NTP_4_3_12
    
      util/invoke-ntp-keygen.texi at 1.14 +2 -2
        NTP_4_3_12
    
      util/ntp-keygen-opts.c at 1.14 +7 -7
        NTP_4_3_12
    
      util/ntp-keygen-opts.h at 1.14 +3 -3
        NTP_4_3_12
    
      util/ntp-keygen.1ntp-keygenman at 1.14 +3 -3
        NTP_4_3_12
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.14 +2 -2
        NTP_4_3_12
    
      util/ntp-keygen.html at 1.14 +2 -2
        NTP_4_3_12
    
      util/ntp-keygen.man.in at 1.14 +3 -3
        NTP_4_3_12
    
      util/ntp-keygen.mdoc.in at 1.14 +2 -2
        NTP_4_3_12
    
    ChangeSet at 1.3346, 2015-04-02 04:47:39-04:00, stenn at deacon.udel.edu
      update
    
      ntpd/invoke-ntpd.texi at 1.14 +20 -3
        update
    
      ntpd/ntpd-opts.c at 1.14 +252 -222
        update
    
      ntpd/ntpd-opts.h at 1.14 +36 -29
        update
    
      ntpd/ntpd.1ntpdman at 1.14 +19 -5
        update
    
      ntpd/ntpd.1ntpdmdoc at 1.14 +17 -4
        update
    
      ntpd/ntpd.man.in at 1.14 +19 -5
        update
    
      ntpd/ntpd.mdoc.in at 1.14 +17 -4
        update
    
    ChangeSet at 1.3345, 2015-04-02 04:26:00-04:00, stenn at deacon.udel.edu
      merge cleanup
    
      ChangeLog at 1.1664 +10 -0
        merge cleanup
    
    ChangeSet at 1.3344, 2015-04-02 04:23:37-04:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.20.8
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.208 +0 -0
        Auto merged
        MERGE: 1.202.4.2
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.4.2 +0 -0
        Merge rename: ntpd/ntp.conf.5man -> BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.81 +0 -0
        Auto merged
        MERGE: 1.76.2.2
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.76.2.2 +0 -0
        Merge rename: scripts/calc_tickadj/invoke-calc_tickadj.texi -> BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.77 +0 -0
        Auto merged
        MERGE: 1.72.3.2
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.72.3.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc -> BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.204 +0 -0
        Auto merged
        MERGE: 1.199.3.2
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.199.3.2 +0 -0
        Merge rename: ntpd/ntp.keys.5mdoc -> BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.98 +0 -0
        Auto merged
        MERGE: 1.93.2.2
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.93.2.2 +0 -0
        Merge rename: scripts/invoke-plot_summary.texi -> BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.84 +0 -0
        Auto merged
        MERGE: 1.79.2.2
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.79.2.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepmdoc -> BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.85 +0 -0
        Auto merged
        MERGE: 1.80.2.2
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.80.2.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.mdoc.in -> BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.3
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.310.3.3 +0 -0
        Merge rename: ntpd/ntpd.man.in -> BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.99 +0 -0
        Auto merged
        MERGE: 1.94.2.2
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.94.2.2 +0 -0
        Merge rename: scripts/plot_summary.html -> BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.505 +0 -0
        Auto merged
        MERGE: 1.500.3.2
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.500.3.2 +0 -0
        Merge rename: ntpq/ntpq-opts.h -> BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.96 +0 -0
        Auto merged
        MERGE: 1.91.2.2
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.91.2.2 +0 -0
        Merge rename: scripts/plot_summary.1plot_summaryman -> BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.45 +0 -0
        Auto merged
        MERGE: 1.40.3.2
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.40.3.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace-opts -> BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.45 +0 -0
        Auto merged
        MERGE: 1.40.3.2
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.40.3.2 +0 -0
        Merge rename: scripts/summary-opts -> BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.318 +0 -0
        Auto merged
        MERGE: 1.313.3.2
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.313.3.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqmdoc -> BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.204 +0 -0
        Auto merged
        MERGE: 1.199.3.2
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.199.3.2 +0 -0
        Merge rename: ntpd/ntp.keys.mdoc.in -> BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.79 +0 -0
        Auto merged
        MERGE: 1.74.2.2
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.74.2.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.html -> BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.77 +0 -0
        Auto merged
        MERGE: 1.72.3.2
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.72.3.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.mdoc.in -> BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.503 +0 -0
        Auto merged
        MERGE: 1.498.3.2
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.498.3.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.h -> BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.502 +0 -0
        Auto merged
        MERGE: 1.497.3.2
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.497.3.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.c -> BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.318 +0 -0
        Auto merged
        MERGE: 1.313.3.3
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.313.3.3 +0 -0
        Merge rename: sntp/sntp.1sntpman -> BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.158 +0 -0
        Auto merged
        MERGE: 1.153.2.2
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.153.2.2 +0 -0
        Merge rename: ntpq/ntpq.html -> BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.310.3.2 +0 -0
        Merge rename: util/ntp-keygen.man.in -> BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.45 +0 -0
        Auto merged
        MERGE: 1.40.3.2
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.40.3.2 +0 -0
        Merge rename: scripts/plot_summary-opts -> BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.76 +0 -0
        Auto merged
        MERGE: 1.71.2.2
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.71.2.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.man.in -> BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.96 +0 -0
        Auto merged
        MERGE: 1.91.3.2
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.91.3.2 +0 -0
        Merge rename: scripts/ntptrace/invoke-ntptrace.texi -> BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.204 +0 -0
        Auto merged
        MERGE: 1.199.3.2
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.199.3.2 +0 -0
        Merge rename: ntpd/ntp.keys.5man -> BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.507 +0 -0
        Auto merged
        MERGE: 1.502.3.2
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.502.3.2 +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.85 +0 -0
        Auto merged
        MERGE: 1.80.3.2
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.80.3.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.mdoc.in -> BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.310.3.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc -> BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.501 +1 -3
        ?
        MERGE: 1.492.2.3
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.492.2.3 +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.98 +0 -0
        Auto merged
        MERGE: 1.93.2.2
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.93.2.2 +0 -0
        Merge rename: scripts/invoke-summary.texi -> BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.310.3.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcman -> BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.501 +0 -0
        Auto merged
        MERGE: 1.496.3.3
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.496.3.3 +0 -0
        Merge rename: sntp/sntp-opts.c -> BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.318 +0 -0
        Auto merged
        MERGE: 1.313.3.3
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.313.3.3 +0 -0
        Merge rename: sntp/sntp.mdoc.in -> BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.3
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.310.3.3 +0 -0
        Merge rename: ntpd/ntpd.1ntpdman -> BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.3
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.310.3.3 +0 -0
        Merge rename: ntpd/ntpd.mdoc.in -> BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.328 +0 -0
        Auto merged
        MERGE: 1.323.3.2
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.323.3.2 +0 -0
        Merge rename: ntpdc/ntpdc.html -> BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.77 +0 -0
        Auto merged
        MERGE: 1.72.2.2
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.72.2.2 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjman -> BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.324 +0 -0
        Auto merged
        MERGE: 1.319.3.2
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.319.3.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.html -> BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.96 +0 -0
        Auto merged
        MERGE: 1.91.2.2
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.91.2.2 +0 -0
        Merge rename: scripts/summary.1summaryman -> BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.96 +0 -0
        Auto merged
        MERGE: 1.91.2.2
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.91.2.2 +0 -0
        Merge rename: scripts/summary.mdoc.in -> BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.318 +0 -0
        Auto merged
        MERGE: 1.313.3.3
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.313.3.3 +0 -0
        Merge rename: sntp/sntp.1sntpmdoc -> BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.3
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.310.3.3 +0 -0
        Merge rename: ntpd/ntpd.1ntpdmdoc -> BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.162 +0 -0
        Auto merged
        MERGE: 1.157.2.2
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.157.2.2 +0 -0
        Merge rename: util/ntp-keygen.html -> BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.318 +0 -0
        Auto merged
        MERGE: 1.313.3.2
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.313.3.2 +0 -0
        Merge rename: ntpq/ntpq.man.in -> BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.84 +0 -0
        Auto merged
        MERGE: 1.79.2.2
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.79.2.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepman -> BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.96 +0 -0
        Auto merged
        MERGE: 1.91.2.2
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.91.2.2 +0 -0
        Merge rename: scripts/ntpsweep/invoke-ntpsweep.texi -> BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.318 +0 -0
        Auto merged
        MERGE: 1.313.3.3
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.313.3.3 +0 -0
        Merge rename: sntp/sntp.man.in -> BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.97 +0 -0
        Auto merged
        MERGE: 1.92.2.2
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.92.2.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.html -> BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.484 +0 -0
        Auto merged
        MERGE: 1.479.3.2
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.479.3.2 +0 -0
        Merge rename: ntpdc/invoke-ntpdc.texi -> BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.84 +0 -0
        Auto merged
        MERGE: 1.79.2.2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.79.2.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.man.in -> BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.487 +0 -0
        Auto merged
        MERGE: 1.482.3.2
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.482.3.2 +0 -0
        Merge rename: util/invoke-ntp-keygen.texi -> BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.490 +0 -0
        Auto merged
        MERGE: 1.485.3.2
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.485.3.2 +0 -0
        Merge rename: ntpq/invoke-ntpq.texi -> BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.166 +0 -0
        Auto merged
        MERGE: 1.161.2.2
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.161.2.2 +0 -0
        Merge rename: ntpd/ntp.conf.html -> BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.486 +0 -0
        Auto merged
        MERGE: 1.481.3.2
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.481.3.2 +0 -0
        Merge rename: ntpsnmpd/invoke-ntpsnmpd.texi -> BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.97 +0 -0
        Auto merged
        MERGE: 1.92.3.2
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.92.3.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.html -> BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.486 +0 -0
        Auto merged
        MERGE: 1.481.3.3
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.481.3.3 +0 -0
        Merge rename: ntpd/invoke-ntpd.texi -> BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.310.3.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.mdoc.in -> BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.167 +0 -0
        Auto merged
        MERGE: 1.162.2.2
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.162.2.2 +0 -0
        Merge rename: ntpd/ntp.keys.html -> BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.305 +0 -0
        Auto merged
        MERGE: 1.300.3.2
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.300.3.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.mdoc.in -> BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.305 +0 -0
        Auto merged
        MERGE: 1.300.2.2
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.300.2.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.man.in -> BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.208 +0 -0
        Auto merged
        MERGE: 1.202.4.2
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.4.2 +0 -0
        Merge rename: ntpd/ntp.conf.mdoc.in -> BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.43 +0 -0
        Auto merged
        MERGE: 1.38.3.2
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.38.3.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait-opts -> BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.318 +0 -0
        Auto merged
        MERGE: 1.313.3.2
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.313.3.2 +0 -0
        Merge rename: ntpq/ntpq.mdoc.in -> BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.161 +0 -0
        Auto merged
        MERGE: 1.156.2.2
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.156.2.2 +0 -0
        Merge rename: ntpd/ntpd.html -> BitKeeper/deleted/93/ntpd.html~fab305284d96b809
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.174 +0 -0
        Auto merged
        MERGE: 1.168.4.2
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.4.2 +0 -0
        Merge rename: ntpd/invoke-ntp.conf.texi -> BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.96 +0 -0
        Auto merged
        MERGE: 1.91.2.2
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.91.2.2 +0 -0
        Merge rename: scripts/summary.man.in -> BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.507 +0 -0
        Auto merged
        MERGE: 1.502.3.4
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.502.3.4 +0 -0
        Merge rename: ntpd/ntpd-opts.c -> BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.305 +0 -0
        Auto merged
        MERGE: 1.300.2.2
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.300.2.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitman -> BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.310.3.2 +0 -0
        Merge rename: util/ntp-keygen.mdoc.in -> BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.503 +0 -0
        Auto merged
        MERGE: 1.498.3.2
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.498.3.2 +0 -0
        Merge rename: util/ntp-keygen-opts.h -> BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.208 +0 -0
        Auto merged
        MERGE: 1.202.4.2
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.4.2 +0 -0
        Merge rename: ntpd/ntp.conf.man.in -> BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.170 +0 -0
        Auto merged
        MERGE: 1.165.3.2
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.165.3.2 +0 -0
        Merge rename: ntpd/invoke-ntp.keys.texi -> BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.208 +0 -0
        Auto merged
        MERGE: 1.202.4.2
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.4.2 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.310.3.2 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenmdoc -> BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.305 +0 -0
        Auto merged
        MERGE: 1.300.3.2
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.300.3.2 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitmdoc -> BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.96 +0 -0
        Auto merged
        MERGE: 1.91.2.2
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.91.2.2 +0 -0
        Merge rename: scripts/summary.1summarymdoc -> BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.310.3.2 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcmdoc -> BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.318 +0 -0
        Auto merged
        MERGE: 1.313.3.2
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.313.3.2 +0 -0
        Merge rename: ntpq/ntpq.1ntpqman -> BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.84 +0 -0
        Auto merged
        MERGE: 1.79.2.2
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.79.2.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.man.in -> BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.506 +0 -0
        Auto merged
        MERGE: 1.501.3.4
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.501.3.4 +0 -0
        Merge rename: ntpd/ntpd-opts.h -> BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.504 +0 -0
        Auto merged
        MERGE: 1.499.3.2
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.499.3.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.c -> BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.500 +0 -0
        Auto merged
        MERGE: 1.495.3.3
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.495.3.3 +0 -0
        Merge rename: sntp/sntp-opts.h -> BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.96 +0 -0
        Auto merged
        MERGE: 1.91.2.2
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.91.2.2 +0 -0
        Merge rename: scripts/plot_summary.man.in -> BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.310.3.2 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenman -> BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.84 +0 -0
        Auto merged
        MERGE: 1.79.3.2
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.79.3.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptracemdoc -> BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.307 +0 -0
        Auto merged
        MERGE: 1.302.3.2
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.302.3.2 +0 -0
        Merge rename: scripts/ntp-wait/invoke-ntp-wait.texi -> BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.310.3.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdman -> BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.310.3.2 +0 -0
        Merge rename: ntpdc/ntpdc.mdoc.in -> BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.310.3.2 +0 -0
        Merge rename: ntpdc/ntpdc.man.in -> BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.315 +0 -0
        Auto merged
        MERGE: 1.310.3.2
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.310.3.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.man.in -> BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.45 +0 -0
        Auto merged
        MERGE: 1.40.3.2
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.40.3.2 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep-opts -> BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.504 +0 -0
        Auto merged
        MERGE: 1.499.3.2
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.499.3.2 +0 -0
        Merge rename: util/ntp-keygen-opts.c -> BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.84 +0 -0
        Auto merged
        MERGE: 1.79.2.2
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.79.2.2 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptraceman -> BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.204 +0 -0
        Auto merged
        MERGE: 1.199.3.2
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.199.3.2 +0 -0
        Merge rename: ntpd/ntp.keys.man.in -> BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.483 +0 -0
        Auto merged
        MERGE: 1.478.3.3
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.478.3.3 +0 -0
        Merge rename: sntp/invoke-sntp.texi -> BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.501 +0 -0
        Auto merged
        MERGE: 1.496.3.2
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.496.3.2 +0 -0
        Merge rename: ntpdc/ntpdc-opts.h -> BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.156 +0 -0
        Auto merged
        MERGE: 1.151.2.2
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.151.2.2 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.html -> BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.96 +0 -0
        Auto merged
        MERGE: 1.91.2.2
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.91.2.2 +0 -0
        Merge rename: scripts/plot_summary.mdoc.in -> BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.99 +0 -0
        Auto merged
        MERGE: 1.94.2.2
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.94.2.2 +0 -0
        Merge rename: scripts/summary.html -> BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.96 +0 -0
        Auto merged
        MERGE: 1.91.2.2
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.91.2.2 +0 -0
        Merge rename: scripts/plot_summary.1plot_summarymdoc -> BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.498 +0 -0
        Auto merged
        MERGE: 1.493.3.3
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.493.3.3 +0 -0
        Merge rename: sntp/sntp.html -> BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2
    
      ChangeLog at 1.1663 +0 -0
        Auto merged
        MERGE: 1.1593.20.6
    
      NEWS at 1.133 +0 -0
        Auto merged
        MERGE: 1.130.2.1
    
    ChangeSet at 1.3343, 2015-03-29 07:13:52+00:00, stenn at deacon.udel.edu
      NTP_4_3_11
      TAG: NTP_4_3_11
    
      ChangeLog at 1.1662 +1 -0
        NTP_4_3_11
    
      ntpd/invoke-ntp.conf.texi at 1.13 +1 -1
        NTP_4_3_11
    
      ntpd/invoke-ntp.keys.texi at 1.13 +1 -1
        NTP_4_3_11
    
      ntpd/invoke-ntpd.texi at 1.13 +2 -2
        NTP_4_3_11
    
      ntpd/ntp.conf.5man at 1.13 +3 -3
        NTP_4_3_11
    
      ntpd/ntp.conf.5mdoc at 1.13 +2 -2
        NTP_4_3_11
    
      ntpd/ntp.conf.html at 1.13 +1 -1
        NTP_4_3_11
    
      ntpd/ntp.conf.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      ntpd/ntp.conf.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      ntpd/ntp.keys.5man at 1.13 +2 -2
        NTP_4_3_11
    
      ntpd/ntp.keys.5mdoc at 1.13 +2 -2
        NTP_4_3_11
    
      ntpd/ntp.keys.html at 1.13 +1 -1
        NTP_4_3_11
    
      ntpd/ntp.keys.man.in at 1.13 +2 -2
        NTP_4_3_11
    
      ntpd/ntp.keys.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      ntpd/ntpd-opts.c at 1.13 +7 -7
        NTP_4_3_11
    
      ntpd/ntpd-opts.h at 1.13 +3 -3
        NTP_4_3_11
    
      ntpd/ntpd.1ntpdman at 1.13 +3 -3
        NTP_4_3_11
    
      ntpd/ntpd.1ntpdmdoc at 1.13 +2 -2
        NTP_4_3_11
    
      ntpd/ntpd.html at 1.13 +2 -2
        NTP_4_3_11
    
      ntpd/ntpd.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      ntpd/ntpd.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      ntpdc/invoke-ntpdc.texi at 1.13 +2 -2
        NTP_4_3_11
    
      ntpdc/ntpdc-opts.c at 1.13 +7 -7
        NTP_4_3_11
    
      ntpdc/ntpdc-opts.h at 1.13 +3 -3
        NTP_4_3_11
    
      ntpdc/ntpdc.1ntpdcman at 1.13 +3 -3
        NTP_4_3_11
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.13 +2 -2
        NTP_4_3_11
    
      ntpdc/ntpdc.html at 1.13 +2 -2
        NTP_4_3_11
    
      ntpdc/ntpdc.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      ntpdc/ntpdc.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      ntpq/invoke-ntpq.texi at 1.13 +2 -2
        NTP_4_3_11
    
      ntpq/ntpq-opts.c at 1.13 +7 -7
        NTP_4_3_11
    
      ntpq/ntpq-opts.h at 1.13 +3 -3
        NTP_4_3_11
    
      ntpq/ntpq.1ntpqman at 1.13 +3 -3
        NTP_4_3_11
    
      ntpq/ntpq.1ntpqmdoc at 1.13 +2 -2
        NTP_4_3_11
    
      ntpq/ntpq.html at 1.13 +2 -2
        NTP_4_3_11
    
      ntpq/ntpq.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      ntpq/ntpq.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.13 +2 -2
        NTP_4_3_11
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.13 +7 -7
        NTP_4_3_11
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.13 +3 -3
        NTP_4_3_11
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.13 +3 -3
        NTP_4_3_11
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.13 +2 -2
        NTP_4_3_11
    
      ntpsnmpd/ntpsnmpd.html at 1.13 +1 -1
        NTP_4_3_11
    
      ntpsnmpd/ntpsnmpd.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      packageinfo.sh at 1.13 +1 -1
        NTP_4_3_11
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/calc_tickadj/calc_tickadj.html at 1.13 +1 -1
        NTP_4_3_11
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.13 +1 -1
        NTP_4_3_11
    
      scripts/invoke-plot_summary.texi at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/invoke-summary.texi at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntp-wait/ntp-wait-opts at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntp-wait/ntp-wait.html at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntp-wait/ntp-wait.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntpsweep/ntpsweep-opts at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntpsweep/ntpsweep.html at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntpsweep/ntpsweep.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntptrace/ntptrace-opts at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntptrace/ntptrace.html at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/ntptrace/ntptrace.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/plot_summary-opts at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/plot_summary.1plot_summaryman at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/plot_summary.1plot_summarymdoc at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/plot_summary.html at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/plot_summary.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/plot_summary.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/summary-opts at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/summary.1summaryman at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/summary.1summarymdoc at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/summary.html at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/summary.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      scripts/summary.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      scripts/update-leap/invoke-update-leap.texi at 1.3 +6 -5
        NTP_4_3_11
    
      scripts/update-leap/update-leap-opts at 1.3 +2 -2
        NTP_4_3_11
    
      scripts/update-leap/update-leap.1update-leapman at 1.3 +7 -6
        NTP_4_3_11
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.3 +6 -5
        NTP_4_3_11
    
      scripts/update-leap/update-leap.html at 1.3 +1 -1
        NTP_4_3_11
    
      scripts/update-leap/update-leap.man.in at 1.3 +7 -6
        NTP_4_3_11
    
      scripts/update-leap/update-leap.mdoc.in at 1.3 +6 -5
        NTP_4_3_11
    
      sntp/invoke-sntp.texi at 1.13 +2 -2
        NTP_4_3_11
    
      sntp/sntp-opts.c at 1.13 +7 -7
        NTP_4_3_11
    
      sntp/sntp-opts.h at 1.13 +3 -3
        NTP_4_3_11
    
      sntp/sntp.1sntpman at 1.13 +3 -3
        NTP_4_3_11
    
      sntp/sntp.1sntpmdoc at 1.13 +2 -2
        NTP_4_3_11
    
      sntp/sntp.html at 1.13 +2 -2
        NTP_4_3_11
    
      sntp/sntp.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      sntp/sntp.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
      util/invoke-ntp-keygen.texi at 1.13 +2 -2
        NTP_4_3_11
    
      util/ntp-keygen-opts.c at 1.13 +7 -7
        NTP_4_3_11
    
      util/ntp-keygen-opts.h at 1.13 +3 -3
        NTP_4_3_11
    
      util/ntp-keygen.1ntp-keygenman at 1.13 +3 -3
        NTP_4_3_11
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.13 +2 -2
        NTP_4_3_11
    
      util/ntp-keygen.html at 1.13 +2 -2
        NTP_4_3_11
    
      util/ntp-keygen.man.in at 1.13 +3 -3
        NTP_4_3_11
    
      util/ntp-keygen.mdoc.in at 1.13 +2 -2
        NTP_4_3_11
    
    ChangeSet at 1.3342, 2015-03-29 05:06:37+00:00, stenn at psp-fb1.ntp.org
      [Bug 2769] cleannup for update-leap
    
      ChangeLog at 1.1661 +1 -0
        [Bug 2769] cleannup for update-leap
    
    ChangeSet at 1.3341, 2015-03-29 04:23:07+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2769
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.1.45
    
      ChangeLog at 1.1660 +0 -0
        Auto merged
        MERGE: 1.1593.1.33
    
      NEWS at 1.132 +0 -6
        Auto merged
        MERGE: 1.130.1.1
    
    ChangeSet at 1.3340, 2015-03-29 01:55:43+00:00, stenn at psp-deb1.ntp.org
      [Bug 2346] "graceful termination" signals do not do peer cleanup
    
      ChangeLog at 1.1659 +2 -0
        [Bug 2346] "graceful termination" signals do not do peer cleanup
    
    ChangeSet at 1.3339, 2015-03-29 01:53:52+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.3265.1.43
    
      ChangeLog at 1.1658 +0 -0
        Auto merged
        MERGE: 1.1593.1.32
    
      lib/isc/unix/ifiter_ioctl.c at 1.35 +0 -0
        Auto merged
        MERGE: 1.33.1.1
    
    ChangeSet at 1.3338, 2015-03-22 08:30:14+00:00, stenn at deacon.udel.edu
      NTP_4_3_10
      TAG: NTP_4_3_10
    
      ChangeLog at 1.1657 +1 -0
        NTP_4_3_10
    
      ntpd/invoke-ntp.conf.texi at 1.12 +1 -1
        NTP_4_3_10
    
      ntpd/invoke-ntp.keys.texi at 1.12 +1 -1
        NTP_4_3_10
    
      ntpd/invoke-ntpd.texi at 1.12 +2 -2
        NTP_4_3_10
    
      ntpd/ntp.conf.5man at 1.12 +3 -3
        NTP_4_3_10
    
      ntpd/ntp.conf.5mdoc at 1.12 +2 -2
        NTP_4_3_10
    
      ntpd/ntp.conf.html at 1.12 +13 -2
        NTP_4_3_10
    
      ntpd/ntp.conf.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      ntpd/ntp.conf.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      ntpd/ntp.keys.5man at 1.12 +2 -2
        NTP_4_3_10
    
      ntpd/ntp.keys.5mdoc at 1.12 +2 -2
        NTP_4_3_10
    
      ntpd/ntp.keys.html at 1.12 +1 -1
        NTP_4_3_10
    
      ntpd/ntp.keys.man.in at 1.12 +2 -2
        NTP_4_3_10
    
      ntpd/ntp.keys.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      ntpd/ntpd-opts.c at 1.12 +239 -239
        NTP_4_3_10
    
      ntpd/ntpd-opts.h at 1.12 +3 -3
        NTP_4_3_10
    
      ntpd/ntpd.1ntpdman at 1.12 +3 -3
        NTP_4_3_10
    
      ntpd/ntpd.1ntpdmdoc at 1.12 +2 -2
        NTP_4_3_10
    
      ntpd/ntpd.html at 1.12 +2 -2
        NTP_4_3_10
    
      ntpd/ntpd.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      ntpd/ntpd.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      ntpdc/invoke-ntpdc.texi at 1.12 +2 -2
        NTP_4_3_10
    
      ntpdc/ntpdc-opts.c at 1.12 +107 -107
        NTP_4_3_10
    
      ntpdc/ntpdc-opts.h at 1.12 +3 -3
        NTP_4_3_10
    
      ntpdc/ntpdc.1ntpdcman at 1.12 +3 -3
        NTP_4_3_10
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.12 +2 -2
        NTP_4_3_10
    
      ntpdc/ntpdc.html at 1.12 +2 -2
        NTP_4_3_10
    
      ntpdc/ntpdc.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      ntpdc/ntpdc.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      ntpq/invoke-ntpq.texi at 1.12 +2 -2
        NTP_4_3_10
    
      ntpq/ntpq-opts.c at 1.12 +106 -106
        NTP_4_3_10
    
      ntpq/ntpq-opts.h at 1.12 +3 -3
        NTP_4_3_10
    
      ntpq/ntpq.1ntpqman at 1.12 +3 -3
        NTP_4_3_10
    
      ntpq/ntpq.1ntpqmdoc at 1.12 +2 -2
        NTP_4_3_10
    
      ntpq/ntpq.html at 1.12 +2 -2
        NTP_4_3_10
    
      ntpq/ntpq.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      ntpq/ntpq.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.12 +2 -2
        NTP_4_3_10
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.12 +68 -68
        NTP_4_3_10
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.12 +3 -3
        NTP_4_3_10
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.12 +3 -3
        NTP_4_3_10
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.12 +2 -2
        NTP_4_3_10
    
      ntpsnmpd/ntpsnmpd.html at 1.12 +1 -1
        NTP_4_3_10
    
      ntpsnmpd/ntpsnmpd.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      packageinfo.sh at 1.12 +1 -1
        NTP_4_3_10
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/calc_tickadj/calc_tickadj.html at 1.12 +1 -1
        NTP_4_3_10
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.12 +1 -1
        NTP_4_3_10
    
      scripts/invoke-plot_summary.texi at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/invoke-summary.texi at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntp-wait/ntp-wait-opts at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntp-wait/ntp-wait.html at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntp-wait/ntp-wait.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntpsweep/ntpsweep-opts at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntpsweep/ntpsweep.html at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntpsweep/ntpsweep.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntptrace/ntptrace-opts at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntptrace/ntptrace.html at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/ntptrace/ntptrace.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/plot_summary-opts at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/plot_summary.1plot_summaryman at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/plot_summary.1plot_summarymdoc at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/plot_summary.html at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/plot_summary.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/plot_summary.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/summary-opts at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/summary.1summaryman at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/summary.1summarymdoc at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/summary.html at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/summary.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      scripts/summary.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      scripts/update-leap/invoke-update-leap.texi at 1.2 +1 -1
        NTP_4_3_10
    
      scripts/update-leap/update-leap-opts at 1.2 +2 -2
        NTP_4_3_10
    
      scripts/update-leap/update-leap.1update-leapman at 1.2 +3 -3
        NTP_4_3_10
    
      scripts/update-leap/update-leap.1update-leapmdoc at 1.2 +1 -1
        NTP_4_3_10
    
      scripts/update-leap/update-leap.html at 1.2 +48 -72
        NTP_4_3_10
    
      scripts/update-leap/update-leap.man.in at 1.2 +3 -3
        NTP_4_3_10
    
      scripts/update-leap/update-leap.mdoc.in at 1.2 +1 -1
        NTP_4_3_10
    
      sntp/invoke-sntp.texi at 1.12 +2 -2
        NTP_4_3_10
    
      sntp/sntp-opts.c at 1.12 +159 -159
        NTP_4_3_10
    
      sntp/sntp-opts.h at 1.12 +3 -3
        NTP_4_3_10
    
      sntp/sntp.1sntpman at 1.12 +3 -3
        NTP_4_3_10
    
      sntp/sntp.1sntpmdoc at 1.12 +2 -2
        NTP_4_3_10
    
      sntp/sntp.html at 1.12 +2 -2
        NTP_4_3_10
    
      sntp/sntp.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      sntp/sntp.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
      util/invoke-ntp-keygen.texi at 1.12 +2 -2
        NTP_4_3_10
    
      util/ntp-keygen-opts.c at 1.12 +173 -173
        NTP_4_3_10
    
      util/ntp-keygen-opts.h at 1.12 +3 -3
        NTP_4_3_10
    
      util/ntp-keygen.1ntp-keygenman at 1.12 +3 -3
        NTP_4_3_10
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.12 +2 -2
        NTP_4_3_10
    
      util/ntp-keygen.html at 1.12 +2 -2
        NTP_4_3_10
    
      util/ntp-keygen.man.in at 1.12 +3 -3
        NTP_4_3_10
    
      util/ntp-keygen.mdoc.in at 1.12 +2 -2
        NTP_4_3_10
    
    ChangeSet at 1.3337, 2015-03-22 08:00:13+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.16.4
    
      ChangeLog at 1.1656 +0 -0
        Auto merged
        MERGE: 1.1593.16.4
    
    ChangeSet at 1.3336, 2015-03-22 03:54:46-04:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.16.3
    
      ChangeLog at 1.1655 +0 -2
        Auto merged
        MERGE: 1.1593.16.3
    
    ChangeSet at 1.3335, 2015-03-22 07:42:36+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2790
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.16.2
    
      ChangeLog at 1.1654 +6 -2
        Merge cleanup
        MERGE: 1.1593.16.2
    
    ChangeSet at 1.3334, 2015-03-22 07:27:07+00:00, stenn at psp-fb1.ntp.org
      Merge cleanup
    
      ChangeLog at 1.1653 +1 -1
        Merge cleanup
    
    ChangeSet at 1.3333, 2015-03-22 07:26:10+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.18.3
    
      ChangeLog at 1.1652 +1 -2
        Merge cleanup
        MERGE: 1.1593.18.3
    
    ChangeSet at 1.3332, 2015-03-22 07:05:37+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2777
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.18.2
    
      ChangeLog at 1.1651 +0 -9
        Merge cleanup
        MERGE: 1.1593.18.2
    
    ChangeSet at 1.3331, 2015-03-22 07:00:47+00:00, stenn at psp-fb1.ntp.org
      Merge cleanup
    
      ChangeLog at 1.1650 +23 -0
        Merge cleanup
    
    ChangeSet at 1.3330, 2015-03-22 06:52:17+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2777
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.18.1
    
      ChangeLog at 1.1649 +9 -9
        Merge cleanup
        MERGE: 1.1593.18.1
    
    ChangeSet at 1.3329, 2015-03-22 06:31:45+00:00, stenn at psp-fb1.ntp.org
      [Bug 2769] New script: update-leap
    
      ChangeLog at 1.1648 +2 -0
        [Bug 2769] New script: update-leap
    
      NEWS at 1.131 +6 -0
        [Bug 2769] New script: update-leap
    
    ChangeSet at 1.3328, 2015-03-22 05:39:50+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2769
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.17.2
    
      ChangeLog at 1.1647 +0 -0
        Auto merged
        MERGE: 1.1593.17.1
    
      configure.ac at 1.587 +0 -0
        Auto merged
        MERGE: 1.581.2.1
    
    ChangeSet at 1.3327, 2015-03-16 12:00:09+00:00, stenn at deacon.udel.edu
      NTP_4_3_9
      TAG: NTP_4_3_9
    
      ChangeLog at 1.1646 +1 -0
        NTP_4_3_9
    
      ntpd/invoke-ntp.conf.texi at 1.11 +15 -2
        NTP_4_3_9
    
      ntpd/invoke-ntp.keys.texi at 1.11 +1 -1
        NTP_4_3_9
    
      ntpd/invoke-ntpd.texi at 1.11 +2 -2
        NTP_4_3_9
    
      ntpd/ntp.conf.5man at 1.11 +19 -4
        NTP_4_3_9
    
      ntpd/ntp.conf.5mdoc at 1.11 +18 -3
        NTP_4_3_9
    
      ntpd/ntp.conf.html at 1.11 +1 -1
        NTP_4_3_9
    
      ntpd/ntp.conf.man.in at 1.11 +19 -4
        NTP_4_3_9
    
      ntpd/ntp.conf.mdoc.in at 1.11 +18 -3
        NTP_4_3_9
    
      ntpd/ntp.keys.5man at 1.11 +2 -2
        NTP_4_3_9
    
      ntpd/ntp.keys.5mdoc at 1.11 +2 -2
        NTP_4_3_9
    
      ntpd/ntp.keys.html at 1.11 +1 -1
        NTP_4_3_9
    
      ntpd/ntp.keys.man.in at 1.11 +2 -2
        NTP_4_3_9
    
      ntpd/ntp.keys.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      ntpd/ntpd-opts.c at 1.11 +7 -7
        NTP_4_3_9
    
      ntpd/ntpd-opts.h at 1.11 +3 -3
        NTP_4_3_9
    
      ntpd/ntpd.1ntpdman at 1.11 +3 -3
        NTP_4_3_9
    
      ntpd/ntpd.1ntpdmdoc at 1.11 +2 -2
        NTP_4_3_9
    
      ntpd/ntpd.html at 1.11 +2 -2
        NTP_4_3_9
    
      ntpd/ntpd.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      ntpd/ntpd.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      ntpdc/invoke-ntpdc.texi at 1.11 +2 -2
        NTP_4_3_9
    
      ntpdc/ntpdc-opts.c at 1.11 +7 -7
        NTP_4_3_9
    
      ntpdc/ntpdc-opts.h at 1.11 +3 -3
        NTP_4_3_9
    
      ntpdc/ntpdc.1ntpdcman at 1.11 +3 -3
        NTP_4_3_9
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.11 +2 -2
        NTP_4_3_9
    
      ntpdc/ntpdc.html at 1.11 +2 -2
        NTP_4_3_9
    
      ntpdc/ntpdc.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      ntpdc/ntpdc.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      ntpq/invoke-ntpq.texi at 1.11 +2 -2
        NTP_4_3_9
    
      ntpq/ntpq-opts.c at 1.11 +7 -7
        NTP_4_3_9
    
      ntpq/ntpq-opts.h at 1.11 +3 -3
        NTP_4_3_9
    
      ntpq/ntpq.1ntpqman at 1.11 +3 -3
        NTP_4_3_9
    
      ntpq/ntpq.1ntpqmdoc at 1.11 +2 -2
        NTP_4_3_9
    
      ntpq/ntpq.html at 1.11 +2 -2
        NTP_4_3_9
    
      ntpq/ntpq.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      ntpq/ntpq.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.11 +2 -2
        NTP_4_3_9
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.11 +7 -7
        NTP_4_3_9
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.11 +3 -3
        NTP_4_3_9
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.11 +3 -3
        NTP_4_3_9
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.11 +2 -2
        NTP_4_3_9
    
      ntpsnmpd/ntpsnmpd.html at 1.11 +1 -1
        NTP_4_3_9
    
      ntpsnmpd/ntpsnmpd.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      packageinfo.sh at 1.11 +1 -1
        NTP_4_3_9
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/calc_tickadj/calc_tickadj.html at 1.11 +1 -1
        NTP_4_3_9
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.11 +1 -1
        NTP_4_3_9
    
      scripts/invoke-plot_summary.texi at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/invoke-summary.texi at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntp-wait/ntp-wait-opts at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntp-wait/ntp-wait.html at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntp-wait/ntp-wait.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntpsweep/ntpsweep-opts at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntpsweep/ntpsweep.html at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntpsweep/ntpsweep.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntptrace/ntptrace-opts at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntptrace/ntptrace.html at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/ntptrace/ntptrace.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/plot_summary-opts at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/plot_summary.1plot_summaryman at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/plot_summary.1plot_summarymdoc at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/plot_summary.html at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/plot_summary.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/plot_summary.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/summary-opts at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/summary.1summaryman at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/summary.1summarymdoc at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/summary.html at 1.11 +2 -2
        NTP_4_3_9
    
      scripts/summary.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      scripts/summary.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      sntp/invoke-sntp.texi at 1.11 +2 -2
        NTP_4_3_9
    
      sntp/sntp-opts.c at 1.11 +7 -7
        NTP_4_3_9
    
      sntp/sntp-opts.h at 1.11 +3 -3
        NTP_4_3_9
    
      sntp/sntp.1sntpman at 1.11 +3 -3
        NTP_4_3_9
    
      sntp/sntp.1sntpmdoc at 1.11 +2 -2
        NTP_4_3_9
    
      sntp/sntp.html at 1.11 +2 -2
        NTP_4_3_9
    
      sntp/sntp.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      sntp/sntp.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
      util/invoke-ntp-keygen.texi at 1.11 +2 -2
        NTP_4_3_9
    
      util/ntp-keygen-opts.c at 1.11 +7 -7
        NTP_4_3_9
    
      util/ntp-keygen-opts.h at 1.11 +3 -3
        NTP_4_3_9
    
      util/ntp-keygen.1ntp-keygenman at 1.11 +3 -3
        NTP_4_3_9
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.11 +2 -2
        NTP_4_3_9
    
      util/ntp-keygen.html at 1.11 +2 -2
        NTP_4_3_9
    
      util/ntp-keygen.man.in at 1.11 +3 -3
        NTP_4_3_9
    
      util/ntp-keygen.mdoc.in at 1.11 +2 -2
        NTP_4_3_9
    
    ChangeSet at 1.3326, 2015-03-16 09:24:25+00:00, stenn at psp-fb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1645 +4 -2
        merge cleanup
    
    ChangeSet at 1.3325, 2015-03-16 09:23:05+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2763
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-2763
      MERGE: 1.3265.14.3
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.207 +0 -0
        Auto merged
        MERGE: 1.202.3.2
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.3.2 +0 -0
        Merge rename: ntpd/ntp.conf.5man -> BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.207 +0 -0
        Auto merged
        MERGE: 1.202.3.2
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.3.2 +0 -0
        Merge rename: ntpd/ntp.conf.mdoc.in -> BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.173 +0 -0
        Auto merged
        MERGE: 1.168.3.2
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.3.2 +0 -0
        Merge rename: ntpd/invoke-ntp.conf.texi -> BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.207 +0 -0
        Auto merged
        MERGE: 1.202.3.2
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.3.2 +0 -0
        Merge rename: ntpd/ntp.conf.man.in -> BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.207 +0 -0
        Auto merged
        MERGE: 1.202.3.2
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.3.2 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      ChangeLog at 1.1644 +0 -0
        Auto merged
        MERGE: 1.1593.14.3
    
    ChangeSet at 1.3324, 2015-03-10 12:36:29+00:00, stenn at deacon.udel.edu
      NTP_4_3_8
      TAG: NTP_4_3_8
    
      ChangeLog at 1.1643 +1 -0
        NTP_4_3_8
    
      ntpd/invoke-ntp.conf.texi at 1.10 +1 -1
        NTP_4_3_8
    
      ntpd/invoke-ntp.keys.texi at 1.10 +1 -1
        NTP_4_3_8
    
      ntpd/invoke-ntpd.texi at 1.10 +2 -2
        NTP_4_3_8
    
      ntpd/ntp.conf.5man at 1.10 +3 -3
        NTP_4_3_8
    
      ntpd/ntp.conf.5mdoc at 1.10 +2 -2
        NTP_4_3_8
    
      ntpd/ntp.conf.html at 1.10 +1 -1
        NTP_4_3_8
    
      ntpd/ntp.conf.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      ntpd/ntp.conf.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      ntpd/ntp.keys.5man at 1.10 +2 -2
        NTP_4_3_8
    
      ntpd/ntp.keys.5mdoc at 1.10 +2 -2
        NTP_4_3_8
    
      ntpd/ntp.keys.html at 1.10 +1 -1
        NTP_4_3_8
    
      ntpd/ntp.keys.man.in at 1.10 +2 -2
        NTP_4_3_8
    
      ntpd/ntp.keys.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      ntpd/ntpd-opts.c at 1.10 +7 -7
        NTP_4_3_8
    
      ntpd/ntpd-opts.h at 1.10 +3 -3
        NTP_4_3_8
    
      ntpd/ntpd.1ntpdman at 1.10 +3 -3
        NTP_4_3_8
    
      ntpd/ntpd.1ntpdmdoc at 1.10 +2 -2
        NTP_4_3_8
    
      ntpd/ntpd.html at 1.10 +2 -2
        NTP_4_3_8
    
      ntpd/ntpd.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      ntpd/ntpd.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      ntpdc/invoke-ntpdc.texi at 1.10 +2 -2
        NTP_4_3_8
    
      ntpdc/ntpdc-opts.c at 1.10 +7 -7
        NTP_4_3_8
    
      ntpdc/ntpdc-opts.h at 1.10 +3 -3
        NTP_4_3_8
    
      ntpdc/ntpdc.1ntpdcman at 1.10 +3 -3
        NTP_4_3_8
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.10 +2 -2
        NTP_4_3_8
    
      ntpdc/ntpdc.html at 1.10 +2 -2
        NTP_4_3_8
    
      ntpdc/ntpdc.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      ntpdc/ntpdc.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      ntpq/invoke-ntpq.texi at 1.10 +2 -2
        NTP_4_3_8
    
      ntpq/ntpq-opts.c at 1.10 +7 -7
        NTP_4_3_8
    
      ntpq/ntpq-opts.h at 1.10 +3 -3
        NTP_4_3_8
    
      ntpq/ntpq.1ntpqman at 1.10 +3 -3
        NTP_4_3_8
    
      ntpq/ntpq.1ntpqmdoc at 1.10 +2 -2
        NTP_4_3_8
    
      ntpq/ntpq.html at 1.10 +2 -2
        NTP_4_3_8
    
      ntpq/ntpq.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      ntpq/ntpq.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.10 +2 -2
        NTP_4_3_8
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.10 +7 -7
        NTP_4_3_8
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.10 +3 -3
        NTP_4_3_8
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.10 +3 -3
        NTP_4_3_8
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.10 +2 -2
        NTP_4_3_8
    
      ntpsnmpd/ntpsnmpd.html at 1.10 +1 -1
        NTP_4_3_8
    
      ntpsnmpd/ntpsnmpd.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      packageinfo.sh at 1.10 +1 -1
        NTP_4_3_8
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/calc_tickadj/calc_tickadj.html at 1.10 +1 -1
        NTP_4_3_8
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.10 +1 -1
        NTP_4_3_8
    
      scripts/invoke-plot_summary.texi at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/invoke-summary.texi at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntp-wait/ntp-wait-opts at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntp-wait/ntp-wait.html at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntp-wait/ntp-wait.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntpsweep/ntpsweep-opts at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntpsweep/ntpsweep.html at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntpsweep/ntpsweep.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntptrace/ntptrace-opts at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntptrace/ntptrace.html at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/ntptrace/ntptrace.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/plot_summary-opts at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/plot_summary.1plot_summaryman at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/plot_summary.1plot_summarymdoc at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/plot_summary.html at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/plot_summary.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/plot_summary.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/summary-opts at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/summary.1summaryman at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/summary.1summarymdoc at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/summary.html at 1.10 +2 -2
        NTP_4_3_8
    
      scripts/summary.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      scripts/summary.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      sntp/invoke-sntp.texi at 1.10 +2 -2
        NTP_4_3_8
    
      sntp/sntp-opts.c at 1.10 +7 -7
        NTP_4_3_8
    
      sntp/sntp-opts.h at 1.10 +3 -3
        NTP_4_3_8
    
      sntp/sntp.1sntpman at 1.10 +3 -3
        NTP_4_3_8
    
      sntp/sntp.1sntpmdoc at 1.10 +2 -2
        NTP_4_3_8
    
      sntp/sntp.html at 1.10 +2 -2
        NTP_4_3_8
    
      sntp/sntp.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      sntp/sntp.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
      util/invoke-ntp-keygen.texi at 1.10 +2 -2
        NTP_4_3_8
    
      util/ntp-keygen-opts.c at 1.10 +7 -7
        NTP_4_3_8
    
      util/ntp-keygen-opts.h at 1.10 +3 -3
        NTP_4_3_8
    
      util/ntp-keygen.1ntp-keygenman at 1.10 +3 -3
        NTP_4_3_8
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.10 +2 -2
        NTP_4_3_8
    
      util/ntp-keygen.html at 1.10 +2 -2
        NTP_4_3_8
    
      util/ntp-keygen.man.in at 1.10 +3 -3
        NTP_4_3_8
    
      util/ntp-keygen.mdoc.in at 1.10 +2 -2
        NTP_4_3_8
    
    ChangeSet at 1.3323, 2015-03-10 12:10:57+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-2752
      MERGE: 1.3319.1.1
    
      ChangeLog at 1.1642 +2 -2
        Merge cleanup
        MERGE: 1.1638.1.1
    
    ChangeSet at 1.3322, 2015-03-10 12:06:55+00:00, stenn at psp-fb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1641 +2 -0
        merge cleanup
    
    ChangeSet at 1.3321, 2015-03-10 12:00:11+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.14.2
    
      ChangeLog at 1.1640 +0 -0
        Auto merged
        MERGE: 1.1593.14.2
    
    ChangeSet at 1.3319.1.1, 2015-03-09 10:57:50+01:00, burnicki at pc-martin4.
      Update for mkver.bat for Windows from David Taylor.
      Account for version numbering scheme introduced after 4.2.x.
    
      ChangeLog at 1.1638.1.1 +2 -0
        Update for mkver.bat for Windows from David Taylor.
        Account for version numbering scheme introduced after 4.2.x.
    
      ports/winnt/scripts/mkver.bat at 1.15 +5 -2
        Update for mkver.bat for Windows from David Taylor.
        Account for version numbering scheme introduced after 4.2.x.
    
    ChangeSet at 1.3265.13.18, 2015-03-07 23:04:03+00:00, stenn at psp-fb1.ntp.org
      [Bug 2782] Refactor refclock_shm.c, add memory barrier protection
    
      ntpd/refclock_shm.c at 1.33.1.1 +6 -1
        [Bug 2782] Refactor refclock_shm.c, add memory barrier protection
    
    ChangeSet at 1.3320, 2015-03-07 22:58:25+00:00, stenn at psp-fb1.ntp.org
      [Bug 2784] Fix for 2782 uses clock_gettime() instead of time()
    
      ChangeLog at 1.1639 +1 -0
        [Bug 2784] Fix for 2782 uses clock_gettime() instead of time()
    
    ChangeSet at 1.3319, 2015-03-07 21:56:16+00:00, stenn at deacon.udel.edu
      NTP_4_3_7
      TAG: NTP_4_3_7
    
      ChangeLog at 1.1638 +1 -0
        NTP_4_3_7
    
      ntpd/invoke-ntp.conf.texi at 1.9 +1 -1
        NTP_4_3_7
    
      ntpd/invoke-ntp.keys.texi at 1.9 +1 -1
        NTP_4_3_7
    
      ntpd/invoke-ntpd.texi at 1.9 +2 -2
        NTP_4_3_7
    
      ntpd/ntp.conf.5man at 1.9 +3 -3
        NTP_4_3_7
    
      ntpd/ntp.conf.5mdoc at 1.9 +2 -2
        NTP_4_3_7
    
      ntpd/ntp.conf.html at 1.9 +1 -1
        NTP_4_3_7
    
      ntpd/ntp.conf.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      ntpd/ntp.conf.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      ntpd/ntp.keys.5man at 1.9 +2 -2
        NTP_4_3_7
    
      ntpd/ntp.keys.5mdoc at 1.9 +2 -2
        NTP_4_3_7
    
      ntpd/ntp.keys.html at 1.9 +1 -1
        NTP_4_3_7
    
      ntpd/ntp.keys.man.in at 1.9 +2 -2
        NTP_4_3_7
    
      ntpd/ntp.keys.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      ntpd/ntpd-opts.c at 1.9 +7 -7
        NTP_4_3_7
    
      ntpd/ntpd-opts.h at 1.9 +3 -3
        NTP_4_3_7
    
      ntpd/ntpd.1ntpdman at 1.9 +3 -3
        NTP_4_3_7
    
      ntpd/ntpd.1ntpdmdoc at 1.9 +2 -2
        NTP_4_3_7
    
      ntpd/ntpd.html at 1.9 +2 -2
        NTP_4_3_7
    
      ntpd/ntpd.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      ntpd/ntpd.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      ntpdc/invoke-ntpdc.texi at 1.9 +2 -2
        NTP_4_3_7
    
      ntpdc/ntpdc-opts.c at 1.9 +7 -7
        NTP_4_3_7
    
      ntpdc/ntpdc-opts.h at 1.9 +3 -3
        NTP_4_3_7
    
      ntpdc/ntpdc.1ntpdcman at 1.9 +3 -3
        NTP_4_3_7
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.9 +2 -2
        NTP_4_3_7
    
      ntpdc/ntpdc.html at 1.9 +2 -2
        NTP_4_3_7
    
      ntpdc/ntpdc.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      ntpdc/ntpdc.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      ntpq/invoke-ntpq.texi at 1.9 +2 -2
        NTP_4_3_7
    
      ntpq/ntpq-opts.c at 1.9 +7 -7
        NTP_4_3_7
    
      ntpq/ntpq-opts.h at 1.9 +3 -3
        NTP_4_3_7
    
      ntpq/ntpq.1ntpqman at 1.9 +3 -3
        NTP_4_3_7
    
      ntpq/ntpq.1ntpqmdoc at 1.9 +2 -2
        NTP_4_3_7
    
      ntpq/ntpq.html at 1.9 +2 -2
        NTP_4_3_7
    
      ntpq/ntpq.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      ntpq/ntpq.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.9 +2 -2
        NTP_4_3_7
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.9 +7 -7
        NTP_4_3_7
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.9 +3 -3
        NTP_4_3_7
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.9 +3 -3
        NTP_4_3_7
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.9 +2 -2
        NTP_4_3_7
    
      ntpsnmpd/ntpsnmpd.html at 1.9 +1 -1
        NTP_4_3_7
    
      ntpsnmpd/ntpsnmpd.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      packageinfo.sh at 1.9 +1 -1
        NTP_4_3_7
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/calc_tickadj/calc_tickadj.html at 1.9 +1 -1
        NTP_4_3_7
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.9 +1 -1
        NTP_4_3_7
    
      scripts/invoke-plot_summary.texi at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/invoke-summary.texi at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntp-wait/ntp-wait-opts at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntp-wait/ntp-wait.html at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntp-wait/ntp-wait.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntpsweep/ntpsweep-opts at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntpsweep/ntpsweep.html at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntpsweep/ntpsweep.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntptrace/ntptrace-opts at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntptrace/ntptrace.html at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/ntptrace/ntptrace.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/plot_summary-opts at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/plot_summary.1plot_summaryman at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/plot_summary.1plot_summarymdoc at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/plot_summary.html at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/plot_summary.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/plot_summary.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/summary-opts at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/summary.1summaryman at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/summary.1summarymdoc at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/summary.html at 1.9 +2 -2
        NTP_4_3_7
    
      scripts/summary.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      scripts/summary.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      sntp/invoke-sntp.texi at 1.9 +2 -2
        NTP_4_3_7
    
      sntp/sntp-opts.c at 1.9 +7 -7
        NTP_4_3_7
    
      sntp/sntp-opts.h at 1.9 +3 -3
        NTP_4_3_7
    
      sntp/sntp.1sntpman at 1.9 +3 -3
        NTP_4_3_7
    
      sntp/sntp.1sntpmdoc at 1.9 +2 -2
        NTP_4_3_7
    
      sntp/sntp.html at 1.9 +2 -2
        NTP_4_3_7
    
      sntp/sntp.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      sntp/sntp.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
      util/invoke-ntp-keygen.texi at 1.9 +2 -2
        NTP_4_3_7
    
      util/ntp-keygen-opts.c at 1.9 +7 -7
        NTP_4_3_7
    
      util/ntp-keygen-opts.h at 1.9 +3 -3
        NTP_4_3_7
    
      util/ntp-keygen.1ntp-keygenman at 1.9 +3 -3
        NTP_4_3_7
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.9 +2 -2
        NTP_4_3_7
    
      util/ntp-keygen.html at 1.9 +2 -2
        NTP_4_3_7
    
      util/ntp-keygen.man.in at 1.9 +3 -3
        NTP_4_3_7
    
      util/ntp-keygen.mdoc.in at 1.9 +2 -2
        NTP_4_3_7
    
    ChangeSet at 1.3318, 2015-03-07 16:55:52-05:00, stenn at deacon.udel.edu
      Revert part of the refclock_shm.c update
    
      ntpd/refclock_shm.c at 1.34 +6 -1
        Revert part of the refclock_shm.c update
    
    ChangeSet at 1.3317, 2015-03-07 01:54:34+00:00, stenn at stenn.ntp.org
      Merge stenn.ntp.org:/home/stenn/ntp-stable-2782
      into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.13.17
    
      ChangeLog at 1.1637 +0 -0
        Auto merged
        MERGE: 1.1593.13.14
    
    ChangeSet at 1.3265.13.17, 2015-03-07 01:51:49+00:00, stenn at stenn.ntp.org
      [Bug 2784] Fix for 2782 uses clock_gettime() instead of get_ostime()
    
      ChangeLog at 1.1593.13.14 +1 -0
        [Bug 2784] Fix for 2782 uses clock_gettime() instead of get_ostime()
    
      ntpd/refclock_shm.c at 1.33 +1 -1
        [Bug 2784] Fix for 2782 uses clock_gettime() instead of get_ostime()
    
    ChangeSet at 1.3316, 2015-03-06 11:58:57+00:00, stenn at deacon.udel.edu
      NTP_4_3_6
      TAG: NTP_4_3_6
    
      ChangeLog at 1.1636 +1 -0
        NTP_4_3_6
    
      ntpd/invoke-ntp.conf.texi at 1.8 +1 -1
        NTP_4_3_6
    
      ntpd/invoke-ntp.keys.texi at 1.8 +1 -1
        NTP_4_3_6
    
      ntpd/invoke-ntpd.texi at 1.8 +2 -2
        NTP_4_3_6
    
      ntpd/ntp.conf.5man at 1.8 +3 -3
        NTP_4_3_6
    
      ntpd/ntp.conf.5mdoc at 1.8 +2 -2
        NTP_4_3_6
    
      ntpd/ntp.conf.html at 1.8 +1 -1
        NTP_4_3_6
    
      ntpd/ntp.conf.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      ntpd/ntp.conf.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      ntpd/ntp.keys.5man at 1.8 +2 -2
        NTP_4_3_6
    
      ntpd/ntp.keys.5mdoc at 1.8 +2 -2
        NTP_4_3_6
    
      ntpd/ntp.keys.html at 1.8 +1 -1
        NTP_4_3_6
    
      ntpd/ntp.keys.man.in at 1.8 +2 -2
        NTP_4_3_6
    
      ntpd/ntp.keys.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      ntpd/ntpd-opts.c at 1.8 +7 -7
        NTP_4_3_6
    
      ntpd/ntpd-opts.h at 1.8 +3 -3
        NTP_4_3_6
    
      ntpd/ntpd.1ntpdman at 1.8 +3 -3
        NTP_4_3_6
    
      ntpd/ntpd.1ntpdmdoc at 1.8 +2 -2
        NTP_4_3_6
    
      ntpd/ntpd.html at 1.8 +2 -2
        NTP_4_3_6
    
      ntpd/ntpd.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      ntpd/ntpd.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      ntpdc/invoke-ntpdc.texi at 1.8 +2 -2
        NTP_4_3_6
    
      ntpdc/ntpdc-opts.c at 1.8 +7 -7
        NTP_4_3_6
    
      ntpdc/ntpdc-opts.h at 1.8 +3 -3
        NTP_4_3_6
    
      ntpdc/ntpdc.1ntpdcman at 1.8 +3 -3
        NTP_4_3_6
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.8 +2 -2
        NTP_4_3_6
    
      ntpdc/ntpdc.html at 1.8 +2 -2
        NTP_4_3_6
    
      ntpdc/ntpdc.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      ntpdc/ntpdc.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      ntpq/invoke-ntpq.texi at 1.8 +2 -2
        NTP_4_3_6
    
      ntpq/ntpq-opts.c at 1.8 +7 -7
        NTP_4_3_6
    
      ntpq/ntpq-opts.h at 1.8 +3 -3
        NTP_4_3_6
    
      ntpq/ntpq.1ntpqman at 1.8 +3 -3
        NTP_4_3_6
    
      ntpq/ntpq.1ntpqmdoc at 1.8 +2 -2
        NTP_4_3_6
    
      ntpq/ntpq.html at 1.8 +2 -2
        NTP_4_3_6
    
      ntpq/ntpq.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      ntpq/ntpq.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.8 +2 -2
        NTP_4_3_6
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.8 +7 -7
        NTP_4_3_6
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.8 +3 -3
        NTP_4_3_6
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.8 +3 -3
        NTP_4_3_6
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.8 +2 -2
        NTP_4_3_6
    
      ntpsnmpd/ntpsnmpd.html at 1.8 +1 -1
        NTP_4_3_6
    
      ntpsnmpd/ntpsnmpd.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      packageinfo.sh at 1.8 +1 -1
        NTP_4_3_6
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/calc_tickadj/calc_tickadj.html at 1.8 +1 -1
        NTP_4_3_6
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.8 +1 -1
        NTP_4_3_6
    
      scripts/invoke-plot_summary.texi at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/invoke-summary.texi at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntp-wait/ntp-wait-opts at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntp-wait/ntp-wait.html at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntp-wait/ntp-wait.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntpsweep/ntpsweep-opts at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntpsweep/ntpsweep.html at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntpsweep/ntpsweep.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntptrace/ntptrace-opts at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntptrace/ntptrace.html at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/ntptrace/ntptrace.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/plot_summary-opts at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/plot_summary.1plot_summaryman at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/plot_summary.1plot_summarymdoc at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/plot_summary.html at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/plot_summary.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/plot_summary.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/summary-opts at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/summary.1summaryman at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/summary.1summarymdoc at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/summary.html at 1.8 +2 -2
        NTP_4_3_6
    
      scripts/summary.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      scripts/summary.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      sntp/invoke-sntp.texi at 1.8 +2 -2
        NTP_4_3_6
    
      sntp/sntp-opts.c at 1.8 +7 -7
        NTP_4_3_6
    
      sntp/sntp-opts.h at 1.8 +3 -3
        NTP_4_3_6
    
      sntp/sntp.1sntpman at 1.8 +3 -3
        NTP_4_3_6
    
      sntp/sntp.1sntpmdoc at 1.8 +2 -2
        NTP_4_3_6
    
      sntp/sntp.html at 1.8 +2 -2
        NTP_4_3_6
    
      sntp/sntp.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      sntp/sntp.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
      util/invoke-ntp-keygen.texi at 1.8 +2 -2
        NTP_4_3_6
    
      util/ntp-keygen-opts.c at 1.8 +7 -7
        NTP_4_3_6
    
      util/ntp-keygen-opts.h at 1.8 +3 -3
        NTP_4_3_6
    
      util/ntp-keygen.1ntp-keygenman at 1.8 +3 -3
        NTP_4_3_6
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.8 +2 -2
        NTP_4_3_6
    
      util/ntp-keygen.html at 1.8 +2 -2
        NTP_4_3_6
    
      util/ntp-keygen.man.in at 1.8 +3 -3
        NTP_4_3_6
    
      util/ntp-keygen.mdoc.in at 1.8 +2 -2
        NTP_4_3_6
    
    ChangeSet at 1.3315, 2015-03-05 21:08:57+00:00, stenn at stenn.ntp.org
      Merge cleanup
    
      ChangeLog at 1.1635 +2 -0
        Merge cleanup
    
    ChangeSet at 1.3314, 2015-03-05 20:18:50+00:00, stenn at stenn.ntp.org
      Merge stenn.ntp.org:/home/stenn/ntp-stable-2782
      into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-2782
      MERGE: 1.3265.13.16
    
      ChangeLog at 1.1634 +0 -0
        Auto merged
        MERGE: 1.1593.13.13
    
      configure.ac at 1.586 +0 -0
        Auto merged
        MERGE: 1.581.1.4
    
    ChangeSet at 1.3265.13.16, 2015-03-05 20:08:21+00:00, stenn at stenn.ntp.org
      [Bug 2782] Refactor refclock_shm.c, add memory barrier protection
    
      ChangeLog at 1.1593.13.13 +1 -0
        [Bug 2782] Refactor refclock_shm.c, add memory barrier protection
    
      configure.ac at 1.581.1.4 +7 -1
        [Bug 2782] Refactor refclock_shm.c, add memory barrier protection
    
      ntpd/refclock_shm.c at 1.32 +196 -108
        [Bug 2782] Refactor refclock_shm.c, add memory barrier protection
    
    ChangeSet at 1.3313, 2015-03-05 11:59:04+00:00, stenn at deacon.udel.edu
      NTP_4_3_5
      TAG: NTP_4_3_5
    
      ChangeLog at 1.1633 +1 -0
        NTP_4_3_5
    
      ntpd/invoke-ntp.conf.texi at 1.7 +1 -1
        NTP_4_3_5
    
      ntpd/invoke-ntp.keys.texi at 1.7 +1 -1
        NTP_4_3_5
    
      ntpd/invoke-ntpd.texi at 1.7 +2 -2
        NTP_4_3_5
    
      ntpd/ntp.conf.5man at 1.7 +3 -3
        NTP_4_3_5
    
      ntpd/ntp.conf.5mdoc at 1.7 +2 -2
        NTP_4_3_5
    
      ntpd/ntp.conf.html at 1.7 +1 -1
        NTP_4_3_5
    
      ntpd/ntp.conf.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      ntpd/ntp.conf.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      ntpd/ntp.keys.5man at 1.7 +2 -2
        NTP_4_3_5
    
      ntpd/ntp.keys.5mdoc at 1.7 +2 -2
        NTP_4_3_5
    
      ntpd/ntp.keys.html at 1.7 +1 -1
        NTP_4_3_5
    
      ntpd/ntp.keys.man.in at 1.7 +2 -2
        NTP_4_3_5
    
      ntpd/ntp.keys.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      ntpd/ntpd-opts.c at 1.7 +7 -7
        NTP_4_3_5
    
      ntpd/ntpd-opts.h at 1.7 +3 -3
        NTP_4_3_5
    
      ntpd/ntpd.1ntpdman at 1.7 +3 -3
        NTP_4_3_5
    
      ntpd/ntpd.1ntpdmdoc at 1.7 +2 -2
        NTP_4_3_5
    
      ntpd/ntpd.html at 1.7 +2 -2
        NTP_4_3_5
    
      ntpd/ntpd.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      ntpd/ntpd.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      ntpdc/invoke-ntpdc.texi at 1.7 +2 -2
        NTP_4_3_5
    
      ntpdc/ntpdc-opts.c at 1.7 +7 -7
        NTP_4_3_5
    
      ntpdc/ntpdc-opts.h at 1.7 +3 -3
        NTP_4_3_5
    
      ntpdc/ntpdc.1ntpdcman at 1.7 +3 -3
        NTP_4_3_5
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.7 +2 -2
        NTP_4_3_5
    
      ntpdc/ntpdc.html at 1.7 +2 -2
        NTP_4_3_5
    
      ntpdc/ntpdc.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      ntpdc/ntpdc.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      ntpq/invoke-ntpq.texi at 1.7 +2 -2
        NTP_4_3_5
    
      ntpq/ntpq-opts.c at 1.7 +7 -7
        NTP_4_3_5
    
      ntpq/ntpq-opts.h at 1.7 +3 -3
        NTP_4_3_5
    
      ntpq/ntpq.1ntpqman at 1.7 +3 -3
        NTP_4_3_5
    
      ntpq/ntpq.1ntpqmdoc at 1.7 +2 -2
        NTP_4_3_5
    
      ntpq/ntpq.html at 1.7 +2 -2
        NTP_4_3_5
    
      ntpq/ntpq.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      ntpq/ntpq.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.7 +2 -2
        NTP_4_3_5
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.7 +7 -7
        NTP_4_3_5
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.7 +3 -3
        NTP_4_3_5
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.7 +3 -3
        NTP_4_3_5
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.7 +2 -2
        NTP_4_3_5
    
      ntpsnmpd/ntpsnmpd.html at 1.7 +1 -1
        NTP_4_3_5
    
      ntpsnmpd/ntpsnmpd.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      packageinfo.sh at 1.7 +1 -1
        NTP_4_3_5
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/calc_tickadj/calc_tickadj.html at 1.7 +1 -1
        NTP_4_3_5
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.7 +1 -1
        NTP_4_3_5
    
      scripts/invoke-plot_summary.texi at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/invoke-summary.texi at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntp-wait/ntp-wait-opts at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntp-wait/ntp-wait.html at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntp-wait/ntp-wait.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntpsweep/ntpsweep-opts at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntpsweep/ntpsweep.html at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntpsweep/ntpsweep.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntptrace/ntptrace-opts at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntptrace/ntptrace.html at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/ntptrace/ntptrace.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/plot_summary-opts at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/plot_summary.1plot_summaryman at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/plot_summary.1plot_summarymdoc at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/plot_summary.html at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/plot_summary.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/plot_summary.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/summary-opts at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/summary.1summaryman at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/summary.1summarymdoc at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/summary.html at 1.7 +2 -2
        NTP_4_3_5
    
      scripts/summary.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      scripts/summary.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      sntp/invoke-sntp.texi at 1.7 +2 -2
        NTP_4_3_5
    
      sntp/sntp-opts.c at 1.7 +7 -7
        NTP_4_3_5
    
      sntp/sntp-opts.h at 1.7 +3 -3
        NTP_4_3_5
    
      sntp/sntp.1sntpman at 1.7 +3 -3
        NTP_4_3_5
    
      sntp/sntp.1sntpmdoc at 1.7 +2 -2
        NTP_4_3_5
    
      sntp/sntp.html at 1.7 +2 -2
        NTP_4_3_5
    
      sntp/sntp.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      sntp/sntp.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
      util/invoke-ntp-keygen.texi at 1.7 +2 -2
        NTP_4_3_5
    
      util/ntp-keygen-opts.c at 1.7 +7 -7
        NTP_4_3_5
    
      util/ntp-keygen-opts.h at 1.7 +3 -3
        NTP_4_3_5
    
      util/ntp-keygen.1ntp-keygenman at 1.7 +3 -3
        NTP_4_3_5
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.7 +2 -2
        NTP_4_3_5
    
      util/ntp-keygen.html at 1.7 +2 -2
        NTP_4_3_5
    
      util/ntp-keygen.man.in at 1.7 +3 -3
        NTP_4_3_5
    
      util/ntp-keygen.mdoc.in at 1.7 +2 -2
        NTP_4_3_5
    
    ChangeSet at 1.3312, 2015-03-05 10:22:00+00:00, stenn at psp-fb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1632 +2 -0
        merge cleanup
    
    ChangeSet at 1.3311, 2015-03-05 10:19:45+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.13.15
    
      ChangeLog at 1.1631 +0 -0
        Auto merged
        MERGE: 1.1593.13.12
    
      configure.ac at 1.585 +0 -0
        Auto merged
        MERGE: 1.581.1.3
    
    ChangeSet at 1.3310, 2015-03-04 11:59:17+00:00, stenn at deacon.udel.edu
      NTP_4_3_4
      TAG: NTP_4_3_4
    
      ChangeLog at 1.1630 +1 -0
        NTP_4_3_4
    
      ntpd/invoke-ntp.conf.texi at 1.6 +1 -1
        NTP_4_3_4
    
      ntpd/invoke-ntp.keys.texi at 1.6 +1 -1
        NTP_4_3_4
    
      ntpd/invoke-ntpd.texi at 1.6 +2 -2
        NTP_4_3_4
    
      ntpd/ntp.conf.5man at 1.6 +3 -3
        NTP_4_3_4
    
      ntpd/ntp.conf.5mdoc at 1.6 +2 -2
        NTP_4_3_4
    
      ntpd/ntp.conf.html at 1.6 +1 -1
        NTP_4_3_4
    
      ntpd/ntp.conf.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      ntpd/ntp.conf.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      ntpd/ntp.keys.5man at 1.6 +2 -2
        NTP_4_3_4
    
      ntpd/ntp.keys.5mdoc at 1.6 +2 -2
        NTP_4_3_4
    
      ntpd/ntp.keys.html at 1.6 +1 -1
        NTP_4_3_4
    
      ntpd/ntp.keys.man.in at 1.6 +2 -2
        NTP_4_3_4
    
      ntpd/ntp.keys.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      ntpd/ntpd-opts.c at 1.6 +7 -7
        NTP_4_3_4
    
      ntpd/ntpd-opts.h at 1.6 +3 -3
        NTP_4_3_4
    
      ntpd/ntpd.1ntpdman at 1.6 +3 -3
        NTP_4_3_4
    
      ntpd/ntpd.1ntpdmdoc at 1.6 +2 -2
        NTP_4_3_4
    
      ntpd/ntpd.html at 1.6 +2 -2
        NTP_4_3_4
    
      ntpd/ntpd.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      ntpd/ntpd.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      ntpdc/invoke-ntpdc.texi at 1.6 +2 -2
        NTP_4_3_4
    
      ntpdc/ntpdc-opts.c at 1.6 +7 -7
        NTP_4_3_4
    
      ntpdc/ntpdc-opts.h at 1.6 +3 -3
        NTP_4_3_4
    
      ntpdc/ntpdc.1ntpdcman at 1.6 +3 -3
        NTP_4_3_4
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.6 +2 -2
        NTP_4_3_4
    
      ntpdc/ntpdc.html at 1.6 +2 -2
        NTP_4_3_4
    
      ntpdc/ntpdc.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      ntpdc/ntpdc.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      ntpq/invoke-ntpq.texi at 1.6 +2 -2
        NTP_4_3_4
    
      ntpq/ntpq-opts.c at 1.6 +7 -7
        NTP_4_3_4
    
      ntpq/ntpq-opts.h at 1.6 +3 -3
        NTP_4_3_4
    
      ntpq/ntpq.1ntpqman at 1.6 +3 -3
        NTP_4_3_4
    
      ntpq/ntpq.1ntpqmdoc at 1.6 +2 -2
        NTP_4_3_4
    
      ntpq/ntpq.html at 1.6 +2 -2
        NTP_4_3_4
    
      ntpq/ntpq.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      ntpq/ntpq.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.6 +2 -2
        NTP_4_3_4
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.6 +7 -7
        NTP_4_3_4
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.6 +3 -3
        NTP_4_3_4
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.6 +3 -3
        NTP_4_3_4
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.6 +2 -2
        NTP_4_3_4
    
      ntpsnmpd/ntpsnmpd.html at 1.6 +1 -1
        NTP_4_3_4
    
      ntpsnmpd/ntpsnmpd.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      packageinfo.sh at 1.6 +1 -1
        NTP_4_3_4
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/calc_tickadj/calc_tickadj.html at 1.6 +1 -1
        NTP_4_3_4
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.6 +1 -1
        NTP_4_3_4
    
      scripts/invoke-plot_summary.texi at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/invoke-summary.texi at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntp-wait/ntp-wait-opts at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntp-wait/ntp-wait.html at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntp-wait/ntp-wait.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntpsweep/ntpsweep-opts at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntpsweep/ntpsweep.html at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntpsweep/ntpsweep.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntptrace/ntptrace-opts at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntptrace/ntptrace.html at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/ntptrace/ntptrace.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/plot_summary-opts at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/plot_summary.1plot_summaryman at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/plot_summary.1plot_summarymdoc at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/plot_summary.html at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/plot_summary.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/plot_summary.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/summary-opts at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/summary.1summaryman at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/summary.1summarymdoc at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/summary.html at 1.6 +2 -2
        NTP_4_3_4
    
      scripts/summary.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      scripts/summary.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      sntp/invoke-sntp.texi at 1.6 +2 -2
        NTP_4_3_4
    
      sntp/sntp-opts.c at 1.6 +7 -7
        NTP_4_3_4
    
      sntp/sntp-opts.h at 1.6 +3 -3
        NTP_4_3_4
    
      sntp/sntp.1sntpman at 1.6 +3 -3
        NTP_4_3_4
    
      sntp/sntp.1sntpmdoc at 1.6 +2 -2
        NTP_4_3_4
    
      sntp/sntp.html at 1.6 +2 -2
        NTP_4_3_4
    
      sntp/sntp.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      sntp/sntp.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
      util/invoke-ntp-keygen.texi at 1.6 +2 -2
        NTP_4_3_4
    
      util/ntp-keygen-opts.c at 1.6 +7 -7
        NTP_4_3_4
    
      util/ntp-keygen-opts.h at 1.6 +3 -3
        NTP_4_3_4
    
      util/ntp-keygen.1ntp-keygenman at 1.6 +3 -3
        NTP_4_3_4
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.6 +2 -2
        NTP_4_3_4
    
      util/ntp-keygen.html at 1.6 +2 -2
        NTP_4_3_4
    
      util/ntp-keygen.man.in at 1.6 +3 -3
        NTP_4_3_4
    
      util/ntp-keygen.mdoc.in at 1.6 +2 -2
        NTP_4_3_4
    
    ChangeSet at 1.3309, 2015-03-04 11:19:06+00:00, stenn at psp-fb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1629 +1 -0
        merge cleanup
    
    ChangeSet at 1.3308, 2015-03-04 11:18:10+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.13.14
    
      ChangeLog at 1.1628 +0 -0
        Auto merged
        MERGE: 1.1593.13.11
    
    ChangeSet at 1.3307, 2015-03-02 04:44:07+00:00, stenn at psp-fb1.ntp.org
      From 4.2.8p2: [Bug 2773] Early leap announcement from Palisade/Thunderbolt
    
      ChangeLog at 1.1627 +2 -0
        From 4.2.8p2: [Bug 2773] Early leap announcement from Palisade/Thunderbolt
    
    ChangeSet at 1.3306, 2015-03-02 03:20:02+00:00, stenn at psp-fb1.ntp.org
      Merge bk://bk.ntp.org/ntp-dev
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3304.1.1
    
      ChangeLog at 1.1626 +0 -0
        Auto merged
        MERGE: 1.1624.1.1
    
    ChangeSet at 1.3304.1.1, 2015-03-02 03:19:21+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.13.13
    
      ChangeLog at 1.1624.1.1 +0 -0
        Auto merged
        MERGE: 1.1593.13.10
    
    ChangeSet at 1.3305, 2015-02-28 12:59:24+00:00, stenn at deacon.udel.edu
      NTP_4_3_3
      TAG: NTP_4_3_3
    
      ChangeLog at 1.1625 +1 -0
        NTP_4_3_3
    
      ntpd/invoke-ntp.conf.texi at 1.5 +1 -1
        NTP_4_3_3
    
      ntpd/invoke-ntp.keys.texi at 1.5 +1 -1
        NTP_4_3_3
    
      ntpd/invoke-ntpd.texi at 1.5 +2 -2
        NTP_4_3_3
    
      ntpd/ntp.conf.5man at 1.5 +3 -3
        NTP_4_3_3
    
      ntpd/ntp.conf.5mdoc at 1.5 +2 -2
        NTP_4_3_3
    
      ntpd/ntp.conf.html at 1.5 +1 -1
        NTP_4_3_3
    
      ntpd/ntp.conf.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      ntpd/ntp.conf.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      ntpd/ntp.keys.5man at 1.5 +2 -2
        NTP_4_3_3
    
      ntpd/ntp.keys.5mdoc at 1.5 +2 -2
        NTP_4_3_3
    
      ntpd/ntp.keys.html at 1.5 +1 -1
        NTP_4_3_3
    
      ntpd/ntp.keys.man.in at 1.5 +2 -2
        NTP_4_3_3
    
      ntpd/ntp.keys.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      ntpd/ntpd-opts.c at 1.5 +7 -7
        NTP_4_3_3
    
      ntpd/ntpd-opts.h at 1.5 +3 -3
        NTP_4_3_3
    
      ntpd/ntpd.1ntpdman at 1.5 +3 -3
        NTP_4_3_3
    
      ntpd/ntpd.1ntpdmdoc at 1.5 +2 -2
        NTP_4_3_3
    
      ntpd/ntpd.html at 1.5 +2 -2
        NTP_4_3_3
    
      ntpd/ntpd.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      ntpd/ntpd.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      ntpdc/invoke-ntpdc.texi at 1.5 +2 -2
        NTP_4_3_3
    
      ntpdc/ntpdc-opts.c at 1.5 +7 -7
        NTP_4_3_3
    
      ntpdc/ntpdc-opts.h at 1.5 +3 -3
        NTP_4_3_3
    
      ntpdc/ntpdc.1ntpdcman at 1.5 +3 -3
        NTP_4_3_3
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.5 +2 -2
        NTP_4_3_3
    
      ntpdc/ntpdc.html at 1.5 +2 -2
        NTP_4_3_3
    
      ntpdc/ntpdc.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      ntpdc/ntpdc.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      ntpq/invoke-ntpq.texi at 1.5 +2 -2
        NTP_4_3_3
    
      ntpq/ntpq-opts.c at 1.5 +7 -7
        NTP_4_3_3
    
      ntpq/ntpq-opts.h at 1.5 +3 -3
        NTP_4_3_3
    
      ntpq/ntpq.1ntpqman at 1.5 +3 -3
        NTP_4_3_3
    
      ntpq/ntpq.1ntpqmdoc at 1.5 +2 -2
        NTP_4_3_3
    
      ntpq/ntpq.html at 1.5 +2 -2
        NTP_4_3_3
    
      ntpq/ntpq.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      ntpq/ntpq.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.5 +2 -2
        NTP_4_3_3
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.5 +7 -7
        NTP_4_3_3
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.5 +3 -3
        NTP_4_3_3
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.5 +3 -3
        NTP_4_3_3
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.5 +2 -2
        NTP_4_3_3
    
      ntpsnmpd/ntpsnmpd.html at 1.5 +1 -1
        NTP_4_3_3
    
      ntpsnmpd/ntpsnmpd.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      packageinfo.sh at 1.5 +1 -1
        NTP_4_3_3
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/calc_tickadj/calc_tickadj.html at 1.5 +1 -1
        NTP_4_3_3
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.5 +1 -1
        NTP_4_3_3
    
      scripts/invoke-plot_summary.texi at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/invoke-summary.texi at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntp-wait/ntp-wait-opts at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntp-wait/ntp-wait.html at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntp-wait/ntp-wait.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntpsweep/ntpsweep-opts at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntpsweep/ntpsweep.html at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntpsweep/ntpsweep.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntptrace/ntptrace-opts at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntptrace/ntptrace.html at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/ntptrace/ntptrace.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/plot_summary-opts at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/plot_summary.1plot_summaryman at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/plot_summary.1plot_summarymdoc at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/plot_summary.html at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/plot_summary.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/plot_summary.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/summary-opts at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/summary.1summaryman at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/summary.1summarymdoc at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/summary.html at 1.5 +2 -2
        NTP_4_3_3
    
      scripts/summary.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      scripts/summary.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      sntp/invoke-sntp.texi at 1.5 +2 -2
        NTP_4_3_3
    
      sntp/sntp-opts.c at 1.5 +7 -7
        NTP_4_3_3
    
      sntp/sntp-opts.h at 1.5 +3 -3
        NTP_4_3_3
    
      sntp/sntp.1sntpman at 1.5 +3 -3
        NTP_4_3_3
    
      sntp/sntp.1sntpmdoc at 1.5 +2 -2
        NTP_4_3_3
    
      sntp/sntp.html at 1.5 +2 -2
        NTP_4_3_3
    
      sntp/sntp.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      sntp/sntp.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
      util/invoke-ntp-keygen.texi at 1.5 +2 -2
        NTP_4_3_3
    
      util/ntp-keygen-opts.c at 1.5 +7 -7
        NTP_4_3_3
    
      util/ntp-keygen-opts.h at 1.5 +3 -3
        NTP_4_3_3
    
      util/ntp-keygen.1ntp-keygenman at 1.5 +3 -3
        NTP_4_3_3
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.5 +2 -2
        NTP_4_3_3
    
      util/ntp-keygen.html at 1.5 +2 -2
        NTP_4_3_3
    
      util/ntp-keygen.man.in at 1.5 +3 -3
        NTP_4_3_3
    
      util/ntp-keygen.mdoc.in at 1.5 +2 -2
        NTP_4_3_3
    
    ChangeSet at 1.3304, 2015-02-28 12:14:22+00:00, stenn at psp-fb1.ntp.org
      Merge cleanup
    
      ChangeLog at 1.1624 +1 -0
        Merge cleanup
    
    ChangeSet at 1.3302, 2015-02-28 12:06:05+00:00, stenn at psp-fb1.ntp.org
      Merge cleanup
    
      ChangeLog at 1.1623 +1 -0
        Merge cleanup
    
    ChangeSet at 1.3301, 2015-02-28 12:05:31+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.13.10
    
      ChangeLog at 1.1622 +0 -0
        Auto merged
        MERGE: 1.1593.13.8
    
    ChangeSet at 1.3300, 2015-02-28 11:36:06+00:00, stenn at psp-fb1.ntp.org
      Merge cleanup
    
      ChangeLog at 1.1621 +1 -0
        Merge cleanup
    
    ChangeSet at 1.3299, 2015-02-28 11:35:08+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.13.9
    
      ChangeLog at 1.1620 +0 -0
        Auto merged
        MERGE: 1.1593.13.7
    
    ChangeSet at 1.3298, 2015-02-28 11:29:21+00:00, stenn at psp-fb1.ntp.org
      Merge cleanup
    
      ChangeLog at 1.1619 +1 -0
        Merge cleanup
    
    ChangeSet at 1.3297, 2015-02-28 11:28:30+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.13.8
    
      ChangeLog at 1.1618 +0 -0
        Auto merged
        MERGE: 1.1593.13.6
    
    ChangeSet at 1.3296, 2015-02-28 11:23:18+00:00, stenn at psp-fb1.ntp.org
      Merge cleanup
    
      ChangeLog at 1.1617 +1 -0
        Merge cleanup
    
    ChangeSet at 1.3295, 2015-02-28 11:21:58+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.13.7
    
      ChangeLog at 1.1616 +0 -0
        Auto merged
        MERGE: 1.1593.13.5
    
    ChangeSet at 1.3294, 2015-02-28 09:49:06+00:00, stenn at psp-fb1.ntp.org
      [Bug 2757] Quiet compiler warnings
    
      ChangeLog at 1.1615 +1 -0
        [Bug 2757] Quiet compiler warnings
    
    ChangeSet at 1.3292, 2015-02-28 09:15:27+00:00, stenn at psp-fb1.ntp.org
      merge cleanup
    
      ChangeLog at 1.1614 +2 -0
        merge cleanup
    
    ChangeSet at 1.3291, 2015-02-28 09:13:49+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev
      MERGE: 1.3265.13.5
    
      ChangeLog at 1.1613 +0 -0
        Auto merged
        MERGE: 1.1593.13.4
    
      configure.ac at 1.584 +0 -0
        Auto merged
        MERGE: 1.581.1.2
    
    ChangeSet at 1.3290, 2015-02-25 11:59:00+00:00, stenn at deacon.udel.edu
      NTP_4_3_2
      TAG: NTP_4_3_2
    
      ChangeLog at 1.1612 +1 -0
        NTP_4_3_2
    
      ntpd/invoke-ntp.conf.texi at 1.4 +1 -1
        NTP_4_3_2
    
      ntpd/invoke-ntp.keys.texi at 1.4 +1 -1
        NTP_4_3_2
    
      ntpd/invoke-ntpd.texi at 1.4 +2 -2
        NTP_4_3_2
    
      ntpd/ntp.conf.5man at 1.4 +3 -3
        NTP_4_3_2
    
      ntpd/ntp.conf.5mdoc at 1.4 +2 -2
        NTP_4_3_2
    
      ntpd/ntp.conf.html at 1.4 +1 -1
        NTP_4_3_2
    
      ntpd/ntp.conf.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      ntpd/ntp.conf.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      ntpd/ntp.keys.5man at 1.4 +2 -2
        NTP_4_3_2
    
      ntpd/ntp.keys.5mdoc at 1.4 +2 -2
        NTP_4_3_2
    
      ntpd/ntp.keys.html at 1.4 +1 -1
        NTP_4_3_2
    
      ntpd/ntp.keys.man.in at 1.4 +2 -2
        NTP_4_3_2
    
      ntpd/ntp.keys.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      ntpd/ntpd-opts.c at 1.4 +7 -7
        NTP_4_3_2
    
      ntpd/ntpd-opts.h at 1.4 +3 -3
        NTP_4_3_2
    
      ntpd/ntpd.1ntpdman at 1.4 +3 -3
        NTP_4_3_2
    
      ntpd/ntpd.1ntpdmdoc at 1.4 +2 -2
        NTP_4_3_2
    
      ntpd/ntpd.html at 1.4 +2 -2
        NTP_4_3_2
    
      ntpd/ntpd.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      ntpd/ntpd.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      ntpdc/invoke-ntpdc.texi at 1.4 +2 -2
        NTP_4_3_2
    
      ntpdc/ntpdc-opts.c at 1.4 +7 -7
        NTP_4_3_2
    
      ntpdc/ntpdc-opts.h at 1.4 +3 -3
        NTP_4_3_2
    
      ntpdc/ntpdc.1ntpdcman at 1.4 +3 -3
        NTP_4_3_2
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.4 +2 -2
        NTP_4_3_2
    
      ntpdc/ntpdc.html at 1.4 +2 -2
        NTP_4_3_2
    
      ntpdc/ntpdc.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      ntpdc/ntpdc.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      ntpq/invoke-ntpq.texi at 1.4 +2 -2
        NTP_4_3_2
    
      ntpq/ntpq-opts.c at 1.4 +7 -7
        NTP_4_3_2
    
      ntpq/ntpq-opts.h at 1.4 +3 -3
        NTP_4_3_2
    
      ntpq/ntpq.1ntpqman at 1.4 +3 -3
        NTP_4_3_2
    
      ntpq/ntpq.1ntpqmdoc at 1.4 +2 -2
        NTP_4_3_2
    
      ntpq/ntpq.html at 1.4 +2 -2
        NTP_4_3_2
    
      ntpq/ntpq.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      ntpq/ntpq.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.4 +2 -2
        NTP_4_3_2
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.4 +7 -7
        NTP_4_3_2
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.4 +3 -3
        NTP_4_3_2
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.4 +3 -3
        NTP_4_3_2
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.4 +2 -2
        NTP_4_3_2
    
      ntpsnmpd/ntpsnmpd.html at 1.4 +1 -1
        NTP_4_3_2
    
      ntpsnmpd/ntpsnmpd.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      packageinfo.sh at 1.4 +1 -1
        NTP_4_3_2
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/calc_tickadj/calc_tickadj.html at 1.4 +1 -1
        NTP_4_3_2
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.4 +1 -1
        NTP_4_3_2
    
      scripts/invoke-plot_summary.texi at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/invoke-summary.texi at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntp-wait/ntp-wait-opts at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntp-wait/ntp-wait.html at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntp-wait/ntp-wait.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntpsweep/ntpsweep-opts at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntpsweep/ntpsweep.html at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntpsweep/ntpsweep.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntptrace/ntptrace-opts at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntptrace/ntptrace.html at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/ntptrace/ntptrace.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/plot_summary-opts at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/plot_summary.1plot_summaryman at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/plot_summary.1plot_summarymdoc at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/plot_summary.html at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/plot_summary.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/plot_summary.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/summary-opts at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/summary.1summaryman at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/summary.1summarymdoc at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/summary.html at 1.4 +2 -2
        NTP_4_3_2
    
      scripts/summary.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      scripts/summary.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      sntp/invoke-sntp.texi at 1.4 +2 -2
        NTP_4_3_2
    
      sntp/sntp-opts.c at 1.4 +7 -7
        NTP_4_3_2
    
      sntp/sntp-opts.h at 1.4 +3 -3
        NTP_4_3_2
    
      sntp/sntp.1sntpman at 1.4 +3 -3
        NTP_4_3_2
    
      sntp/sntp.1sntpmdoc at 1.4 +2 -2
        NTP_4_3_2
    
      sntp/sntp.html at 1.4 +2 -2
        NTP_4_3_2
    
      sntp/sntp.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      sntp/sntp.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
      util/invoke-ntp-keygen.texi at 1.4 +2 -2
        NTP_4_3_2
    
      util/ntp-keygen-opts.c at 1.4 +7 -7
        NTP_4_3_2
    
      util/ntp-keygen-opts.h at 1.4 +3 -3
        NTP_4_3_2
    
      util/ntp-keygen.1ntp-keygenman at 1.4 +3 -3
        NTP_4_3_2
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.4 +2 -2
        NTP_4_3_2
    
      util/ntp-keygen.html at 1.4 +2 -2
        NTP_4_3_2
    
      util/ntp-keygen.man.in at 1.4 +3 -3
        NTP_4_3_2
    
      util/ntp-keygen.mdoc.in at 1.4 +2 -2
        NTP_4_3_2
    
    ChangeSet at 1.3289, 2015-02-25 04:59:47-05:00, stenn at deacon.udel.edu
      From 4.2.8p2: [Bug 2751] jitter.h has stale copies of l_fp macros
    
      ChangeLog at 1.1611 +1 -0
        From 4.2.8p2: [Bug 2751] jitter.h has stale copies of l_fp macros
    
    ChangeSet at 1.3288, 2015-02-25 04:58:02-05:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.13.4
    
      ChangeLog at 1.1610 +0 -0
        Auto merged
        MERGE: 1.1593.13.3
    
    ChangeSet at 1.3287, 2015-02-21 12:03:42+00:00, stenn at deacon.udel.edu
      NTP_4_3_1
      TAG: NTP_4_3_1
    
      ChangeLog at 1.1609 +1 -0
        NTP_4_3_1
    
      ntpd/invoke-ntp.conf.texi at 1.3 +1 -1
        NTP_4_3_1
    
      ntpd/invoke-ntp.keys.texi at 1.3 +1 -1
        NTP_4_3_1
    
      ntpd/invoke-ntpd.texi at 1.3 +2 -2
        NTP_4_3_1
    
      ntpd/ntp.conf.5man at 1.3 +3 -3
        NTP_4_3_1
    
      ntpd/ntp.conf.5mdoc at 1.3 +2 -2
        NTP_4_3_1
    
      ntpd/ntp.conf.html at 1.3 +14 -1
        NTP_4_3_1
    
      ntpd/ntp.conf.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      ntpd/ntp.conf.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      ntpd/ntp.keys.5man at 1.3 +2 -2
        NTP_4_3_1
    
      ntpd/ntp.keys.5mdoc at 1.3 +2 -2
        NTP_4_3_1
    
      ntpd/ntp.keys.html at 1.3 +1 -1
        NTP_4_3_1
    
      ntpd/ntp.keys.man.in at 1.3 +2 -2
        NTP_4_3_1
    
      ntpd/ntp.keys.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      ntpd/ntpd-opts.c at 1.3 +7 -7
        NTP_4_3_1
    
      ntpd/ntpd-opts.h at 1.3 +3 -3
        NTP_4_3_1
    
      ntpd/ntpd.1ntpdman at 1.3 +3 -3
        NTP_4_3_1
    
      ntpd/ntpd.1ntpdmdoc at 1.3 +2 -2
        NTP_4_3_1
    
      ntpd/ntpd.html at 1.3 +2 -2
        NTP_4_3_1
    
      ntpd/ntpd.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      ntpd/ntpd.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      ntpdc/invoke-ntpdc.texi at 1.3 +2 -2
        NTP_4_3_1
    
      ntpdc/ntpdc-opts.c at 1.3 +7 -7
        NTP_4_3_1
    
      ntpdc/ntpdc-opts.h at 1.3 +3 -3
        NTP_4_3_1
    
      ntpdc/ntpdc.1ntpdcman at 1.3 +3 -3
        NTP_4_3_1
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.3 +2 -2
        NTP_4_3_1
    
      ntpdc/ntpdc.html at 1.3 +2 -2
        NTP_4_3_1
    
      ntpdc/ntpdc.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      ntpdc/ntpdc.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      ntpq/invoke-ntpq.texi at 1.3 +2 -2
        NTP_4_3_1
    
      ntpq/ntpq-opts.c at 1.3 +7 -7
        NTP_4_3_1
    
      ntpq/ntpq-opts.h at 1.3 +3 -3
        NTP_4_3_1
    
      ntpq/ntpq.1ntpqman at 1.3 +3 -3
        NTP_4_3_1
    
      ntpq/ntpq.1ntpqmdoc at 1.3 +2 -2
        NTP_4_3_1
    
      ntpq/ntpq.html at 1.3 +2 -2
        NTP_4_3_1
    
      ntpq/ntpq.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      ntpq/ntpq.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.3 +2 -2
        NTP_4_3_1
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.3 +7 -7
        NTP_4_3_1
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.3 +3 -3
        NTP_4_3_1
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.3 +3 -3
        NTP_4_3_1
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.3 +2 -2
        NTP_4_3_1
    
      ntpsnmpd/ntpsnmpd.html at 1.3 +1 -1
        NTP_4_3_1
    
      ntpsnmpd/ntpsnmpd.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      packageinfo.sh at 1.3 +1 -1
        NTP_4_3_1
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/calc_tickadj/calc_tickadj.html at 1.3 +1 -1
        NTP_4_3_1
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.3 +1 -1
        NTP_4_3_1
    
      scripts/invoke-plot_summary.texi at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/invoke-summary.texi at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntp-wait/ntp-wait-opts at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntp-wait/ntp-wait.html at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntp-wait/ntp-wait.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntpsweep/ntpsweep-opts at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntpsweep/ntpsweep.html at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntpsweep/ntpsweep.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntptrace/ntptrace-opts at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntptrace/ntptrace.html at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/ntptrace/ntptrace.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/plot_summary-opts at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/plot_summary.1plot_summaryman at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/plot_summary.1plot_summarymdoc at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/plot_summary.html at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/plot_summary.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/plot_summary.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/summary-opts at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/summary.1summaryman at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/summary.1summarymdoc at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/summary.html at 1.3 +2 -2
        NTP_4_3_1
    
      scripts/summary.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      scripts/summary.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      sntp/invoke-sntp.texi at 1.3 +2 -2
        NTP_4_3_1
    
      sntp/sntp-opts.c at 1.3 +7 -7
        NTP_4_3_1
    
      sntp/sntp-opts.h at 1.3 +3 -3
        NTP_4_3_1
    
      sntp/sntp.1sntpman at 1.3 +3 -3
        NTP_4_3_1
    
      sntp/sntp.1sntpmdoc at 1.3 +2 -2
        NTP_4_3_1
    
      sntp/sntp.html at 1.3 +2 -2
        NTP_4_3_1
    
      sntp/sntp.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      sntp/sntp.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
      util/invoke-ntp-keygen.texi at 1.3 +2 -2
        NTP_4_3_1
    
      util/ntp-keygen-opts.c at 1.3 +7 -7
        NTP_4_3_1
    
      util/ntp-keygen-opts.h at 1.3 +3 -3
        NTP_4_3_1
    
      util/ntp-keygen.1ntp-keygenman at 1.3 +3 -3
        NTP_4_3_1
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.3 +2 -2
        NTP_4_3_1
    
      util/ntp-keygen.html at 1.3 +2 -2
        NTP_4_3_1
    
      util/ntp-keygen.man.in at 1.3 +3 -3
        NTP_4_3_1
    
      util/ntp-keygen.mdoc.in at 1.3 +2 -2
        NTP_4_3_1
    
    ChangeSet at 1.3285, 2015-02-21 05:42:28-05:00, stenn at deacon.udel.edu
      From 4.2.8p2: [Bug 2757] Quiet compiler warnings
    
      ChangeLog at 1.1608 +1 -0
        From 4.2.8p2: [Bug 2757] Quiet compiler warnings
    
    ChangeSet at 1.3284, 2015-02-21 05:39:08-05:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.13.2
    
      ChangeLog at 1.1607 +0 -0
        Auto merged
        MERGE: 1.1593.13.2
    
      lib/isc/unix/ifiter_ioctl.c at 1.34 +0 -0
        Auto merged
        MERGE: 1.32.1.1
    
    ChangeSet at 1.3283, 2015-02-21 09:55:45+00:00, stenn at psp-deb1.ntp.org
      [Bug 2749] ntp/lib/NTP/Util.pm needs update for ntpq -w, IPv6, .POOL.
    
      ChangeLog at 1.1606 +2 -2
        [Bug 2749] ntp/lib/NTP/Util.pm needs update for ntpq -w, IPv6, .POOL.
    
    ChangeSet at 1.3282, 2015-02-21 09:53:22+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev
      MERGE: 1.3265.13.1
    
      ChangeLog at 1.1605 +0 -0
        Auto merged
        MERGE: 1.1593.13.1
    
    ChangeSet at 1.3281, 2015-02-21 09:30:04+00:00, stenn at psp-fb1.ntp.org
      Merge cleanup
    
      ChangeLog at 1.1604 +2 -0
        Merge cleanup
    
    ChangeSet at 1.3280, 2015-02-21 09:28:39+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-1960
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-1960
      MERGE: 1.3265.1.41
    
      ChangeLog at 1.1603 +0 -0
        Auto merged
        MERGE: 1.1593.1.30
    
    ChangeSet at 1.3279, 2015-02-21 03:30:03-05:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.1.40
    
      ChangeLog at 1.1602 +0 -0
        Auto merged
        MERGE: 1.1593.1.29
    
    ChangeSet at 1.3278, 2015-02-21 07:42:29+00:00, stenn at psp-deb1.ntp.org
      Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-2728
      into  psp-deb1.ntp.org:/home/stenn/ntp-dev-2728
      MERGE: 1.3265.12.1
    
      ChangeLog at 1.1601 +2 -2
        Merge cleanup
        MERGE: 1.1593.12.1
    
      configure.ac at 1.583 +0 -0
        Auto merged
        MERGE: 1.581.1.1
    
    ChangeSet at 1.3277, 2015-02-11 06:58:41-05:00, stenn at deacon.udel.edu
      NTP_4_3_0
      TAG: NTP_4_3_0
    
      ChangeLog at 1.1600 +1 -0
        NTP_4_3_0
    
      ntpd/invoke-ntp.conf.texi at 1.2 +15 -1
        NTP_4_3_0
    
      ntpd/invoke-ntp.keys.texi at 1.2 +1 -1
        NTP_4_3_0
    
      ntpd/invoke-ntpd.texi at 1.2 +2 -2
        NTP_4_3_0
    
      ntpd/ntp.conf.5man at 1.2 +20 -5
        NTP_4_3_0
    
      ntpd/ntp.conf.5mdoc at 1.2 +18 -4
        NTP_4_3_0
    
      ntpd/ntp.conf.html at 1.2 +1 -1
        NTP_4_3_0
    
      ntpd/ntp.conf.man.in at 1.2 +20 -5
        NTP_4_3_0
    
      ntpd/ntp.conf.mdoc.in at 1.2 +18 -4
        NTP_4_3_0
    
      ntpd/ntp.keys.5man at 1.2 +4 -4
        NTP_4_3_0
    
      ntpd/ntp.keys.5mdoc at 1.2 +4 -4
        NTP_4_3_0
    
      ntpd/ntp.keys.html at 1.2 +1 -1
        NTP_4_3_0
    
      ntpd/ntp.keys.man.in at 1.2 +4 -4
        NTP_4_3_0
    
      ntpd/ntp.keys.mdoc.in at 1.2 +4 -4
        NTP_4_3_0
    
      ntpd/ntpd-opts.c at 1.2 +251 -249
        NTP_4_3_0
    
      ntpd/ntpd-opts.h at 1.2 +5 -5
        NTP_4_3_0
    
      ntpd/ntpd.1ntpdman at 1.2 +5 -5
        NTP_4_3_0
    
      ntpd/ntpd.1ntpdmdoc at 1.2 +4 -4
        NTP_4_3_0
    
      ntpd/ntpd.html at 1.2 +2 -2
        NTP_4_3_0
    
      ntpd/ntpd.man.in at 1.2 +5 -5
        NTP_4_3_0
    
      ntpd/ntpd.mdoc.in at 1.2 +4 -4
        NTP_4_3_0
    
      ntpdc/invoke-ntpdc.texi at 1.2 +2 -2
        NTP_4_3_0
    
      ntpdc/ntpdc-opts.c at 1.2 +119 -117
        NTP_4_3_0
    
      ntpdc/ntpdc-opts.h at 1.2 +5 -5
        NTP_4_3_0
    
      ntpdc/ntpdc.1ntpdcman at 1.2 +4 -4
        NTP_4_3_0
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.2 +3 -3
        NTP_4_3_0
    
      ntpdc/ntpdc.html at 1.2 +2 -2
        NTP_4_3_0
    
      ntpdc/ntpdc.man.in at 1.2 +4 -4
        NTP_4_3_0
    
      ntpdc/ntpdc.mdoc.in at 1.2 +3 -3
        NTP_4_3_0
    
      ntpq/invoke-ntpq.texi at 1.2 +2 -2
        NTP_4_3_0
    
      ntpq/ntpq-opts.c at 1.2 +118 -116
        NTP_4_3_0
    
      ntpq/ntpq-opts.h at 1.2 +5 -5
        NTP_4_3_0
    
      ntpq/ntpq.1ntpqman at 1.2 +5 -5
        NTP_4_3_0
    
      ntpq/ntpq.1ntpqmdoc at 1.2 +4 -4
        NTP_4_3_0
    
      ntpq/ntpq.html at 1.2 +2 -2
        NTP_4_3_0
    
      ntpq/ntpq.man.in at 1.2 +5 -5
        NTP_4_3_0
    
      ntpq/ntpq.mdoc.in at 1.2 +4 -4
        NTP_4_3_0
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.2 +2 -2
        NTP_4_3_0
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.2 +80 -78
        NTP_4_3_0
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.2 +5 -5
        NTP_4_3_0
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.2 +4 -4
        NTP_4_3_0
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.2 +3 -3
        NTP_4_3_0
    
      ntpsnmpd/ntpsnmpd.html at 1.2 +1 -1
        NTP_4_3_0
    
      ntpsnmpd/ntpsnmpd.man.in at 1.2 +4 -4
        NTP_4_3_0
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.2 +3 -3
        NTP_4_3_0
    
      packageinfo.sh at 1.2 +1 -1
        NTP_4_3_0
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/calc_tickadj/calc_tickadj.html at 1.2 +1 -1
        NTP_4_3_0
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.2 +1 -1
        NTP_4_3_0
    
      scripts/invoke-plot_summary.texi at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/invoke-summary.texi at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntp-wait/ntp-wait-opts at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntp-wait/ntp-wait.html at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntp-wait/ntp-wait.man.in at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntpsweep/ntpsweep-opts at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntpsweep/ntpsweep.html at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntpsweep/ntpsweep.man.in at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntptrace/ntptrace-opts at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntptrace/ntptrace.html at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/ntptrace/ntptrace.man.in at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/plot_summary-opts at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/plot_summary.1plot_summaryman at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/plot_summary.1plot_summarymdoc at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/plot_summary.html at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/plot_summary.man.in at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/plot_summary.mdoc.in at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/summary-opts at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/summary.1summaryman at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/summary.1summarymdoc at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/summary.html at 1.2 +2 -2
        NTP_4_3_0
    
      scripts/summary.man.in at 1.2 +3 -3
        NTP_4_3_0
    
      scripts/summary.mdoc.in at 1.2 +2 -2
        NTP_4_3_0
    
      sntp/invoke-sntp.texi at 1.2 +5 -3
        NTP_4_3_0
    
      sntp/sntp-opts.c at 1.2 +174 -170
        NTP_4_3_0
    
      sntp/sntp-opts.h at 1.2 +5 -5
        NTP_4_3_0
    
      sntp/sntp.1sntpman at 1.2 +24 -8
        NTP_4_3_0
    
      sntp/sntp.1sntpmdoc at 1.2 +22 -7
        NTP_4_3_0
    
      sntp/sntp.html at 1.2 +5 -3
        NTP_4_3_0
    
      sntp/sntp.man.in at 1.2 +24 -8
        NTP_4_3_0
    
      sntp/sntp.mdoc.in at 1.2 +22 -7
        NTP_4_3_0
    
      util/invoke-ntp-keygen.texi at 1.2 +2 -2
        NTP_4_3_0
    
      util/ntp-keygen-opts.c at 1.2 +185 -183
        NTP_4_3_0
    
      util/ntp-keygen-opts.h at 1.2 +5 -5
        NTP_4_3_0
    
      util/ntp-keygen.1ntp-keygenman at 1.2 +5 -5
        NTP_4_3_0
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.2 +4 -4
        NTP_4_3_0
    
      util/ntp-keygen.html at 1.2 +2 -2
        NTP_4_3_0
    
      util/ntp-keygen.man.in at 1.2 +5 -5
        NTP_4_3_0
    
      util/ntp-keygen.mdoc.in at 1.2 +4 -4
        NTP_4_3_0
    
    ChangeSet at 1.3276, 2015-02-11 09:10:17+00:00, stenn at psp-fb1.ntp.org
      [Bug 2747] Upgrade libevent to 2.1.5-beta
    
      ChangeLog at 1.1599 +3 -0
        [Bug 2747] Upgrade libevent to 2.1.5-beta
    
    ChangeSet at 1.3275, 2015-02-11 09:09:13+00:00, stenn at psp-fb1.ntp.org
      Merge psp-fb1.ntp.org:/home/stenn/ntp-stable-2747
      into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-2747
      MERGE: 1.3265.1.39
    
      ChangeLog at 1.1598 +0 -0
        Auto merged
        MERGE: 1.1593.1.28
    
    ChangeSet at 1.3273, 2015-02-10 04:45:15-05:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.1.37
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.206 +15 -3
        MERGE: 1.202.1.10
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.202.1.10 +0 -0
        Merge rename: ntpd/ntp.conf.5man -> BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.80 +0 -1
        MERGE: 1.76.1.9
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.76.1.9 +0 -0
        Merge rename: scripts/calc_tickadj/invoke-calc_tickadj.texi -> BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.76 +0 -2
        MERGE: 1.72.1.10
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.72.1.10 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc -> BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.203 +0 -2
        MERGE: 1.199.1.10
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.199.1.10 +0 -0
        Merge rename: ntpd/ntp.keys.5mdoc -> BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.97 +0 -2
        MERGE: 1.93.1.9
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.93.1.9 +0 -0
        Merge rename: scripts/invoke-plot_summary.texi -> BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.83 +0 -2
        MERGE: 1.79.1.9
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.79.1.9 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepmdoc -> BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.84 +0 -2
        MERGE: 1.80.1.9
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.80.1.9 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.mdoc.in -> BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.314 +0 -3
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.310.1.10 +0 -0
        Merge rename: ntpd/ntpd.man.in -> BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.98 +0 -2
        MERGE: 1.94.1.9
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.94.1.9 +0 -0
        Merge rename: scripts/plot_summary.html -> BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.504 +0 -3
        MERGE: 1.500.1.10
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.500.1.10 +0 -0
        Merge rename: ntpq/ntpq-opts.h -> BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.95 +0 -3
        MERGE: 1.91.1.9
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.91.1.9 +0 -0
        Merge rename: scripts/plot_summary.1plot_summaryman -> BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.44 +0 -2
        MERGE: 1.40.1.10
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.40.1.10 +0 -0
        Merge rename: scripts/ntptrace/ntptrace-opts -> BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.44 +0 -2
        MERGE: 1.40.1.10
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.40.1.10 +0 -0
        Merge rename: scripts/summary-opts -> BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.317 +0 -2
        MERGE: 1.313.1.10
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.313.1.10 +0 -0
        Merge rename: ntpq/ntpq.1ntpqmdoc -> BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.203 +0 -2
        MERGE: 1.199.1.10
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.199.1.10 +0 -0
        Merge rename: ntpd/ntp.keys.mdoc.in -> BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.78 +0 -1
        MERGE: 1.74.1.9
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.74.1.9 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.html -> BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.76 +0 -2
        MERGE: 1.72.1.10
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.72.1.10 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.mdoc.in -> BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.502 +0 -3
        MERGE: 1.498.1.10
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.498.1.10 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.h -> BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.501 +5 -103
        MERGE: 1.497.1.10
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.497.1.10 +0 -0
        Merge rename: ntpdc/ntpdc-opts.c -> BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.317 +0 -3
        MERGE: 1.313.1.10
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.313.1.10 +0 -0
        Merge rename: sntp/sntp.1sntpman -> BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.157 +0 -2
        MERGE: 1.153.1.9
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.153.1.9 +0 -0
        Merge rename: ntpq/ntpq.html -> BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.314 +0 -3
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.310.1.10 +0 -0
        Merge rename: util/ntp-keygen.man.in -> BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.44 +0 -2
        MERGE: 1.40.1.10
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.40.1.10 +0 -0
        Merge rename: scripts/plot_summary-opts -> BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.75 +0 -3
        MERGE: 1.71.1.9
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.71.1.9 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.man.in -> BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.95 +0 -2
        MERGE: 1.91.1.10
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.91.1.10 +0 -0
        Merge rename: scripts/ntptrace/invoke-ntptrace.texi -> BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.203 +0 -2
        MERGE: 1.199.1.10
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.199.1.10 +0 -0
        Merge rename: ntpd/ntp.keys.5man -> BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.506 +5 -102
        MERGE: 1.502.1.10
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.502.1.10 +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.84 +0 -2
        MERGE: 1.80.1.10
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.80.1.10 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.mdoc.in -> BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.314 +0 -2
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.310.1.10 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc -> BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.500 +0 -3
        Auto merged
        MERGE: 1.492.1.12
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.492.1.12 +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.97 +0 -2
        MERGE: 1.93.1.9
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.93.1.9 +0 -0
        Merge rename: scripts/invoke-summary.texi -> BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.314 +0 -3
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.310.1.10 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcman -> BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.500 +5 -155
        MERGE: 1.496.1.11
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.496.1.11 +0 -0
        Merge rename: sntp/sntp-opts.c -> BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.317 +0 -2
        MERGE: 1.313.1.10
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.313.1.10 +0 -0
        Merge rename: sntp/sntp.mdoc.in -> BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.314 +0 -3
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.310.1.10 +0 -0
        Merge rename: ntpd/ntpd.1ntpdman -> BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.314 +0 -2
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.310.1.10 +0 -0
        Merge rename: ntpd/ntpd.mdoc.in -> BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.327 +0 -2
        MERGE: 1.323.1.10
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.323.1.10 +0 -0
        Merge rename: ntpdc/ntpdc.html -> BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.76 +0 -3
        MERGE: 1.72.1.9
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.72.1.9 +0 -0
        Merge rename: scripts/calc_tickadj/calc_tickadj.1calc_tickadjman -> BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.323 +0 -2
        MERGE: 1.319.1.10
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.319.1.10 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.html -> BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.95 +0 -3
        MERGE: 1.91.1.9
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.91.1.9 +0 -0
        Merge rename: scripts/summary.1summaryman -> BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.95 +0 -2
        MERGE: 1.91.1.9
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.91.1.9 +0 -0
        Merge rename: scripts/summary.mdoc.in -> BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.317 +0 -2
        MERGE: 1.313.1.10
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.313.1.10 +0 -0
        Merge rename: sntp/sntp.1sntpmdoc -> BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.314 +0 -2
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.310.1.10 +0 -0
        Merge rename: ntpd/ntpd.1ntpdmdoc -> BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.161 +0 -2
        MERGE: 1.157.1.9
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.157.1.9 +0 -0
        Merge rename: util/ntp-keygen.html -> BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.317 +0 -3
        MERGE: 1.313.1.10
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.313.1.10 +0 -0
        Merge rename: ntpq/ntpq.man.in -> BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.83 +0 -3
        MERGE: 1.79.1.9
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.79.1.9 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.1ntpsweepman -> BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.95 +0 -2
        MERGE: 1.91.1.9
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.91.1.9 +0 -0
        Merge rename: scripts/ntpsweep/invoke-ntpsweep.texi -> BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.317 +0 -3
        MERGE: 1.313.1.10
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.313.1.10 +0 -0
        Merge rename: sntp/sntp.man.in -> BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.96 +0 -2
        MERGE: 1.92.1.9
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.92.1.9 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.html -> BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.483 +0 -2
        MERGE: 1.479.1.10
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.479.1.10 +0 -0
        Merge rename: ntpdc/invoke-ntpdc.texi -> BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.83 +0 -3
        MERGE: 1.79.1.9
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.79.1.9 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.man.in -> BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.486 +0 -2
        MERGE: 1.482.1.10
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.482.1.10 +0 -0
        Merge rename: util/invoke-ntp-keygen.texi -> BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.489 +0 -2
        MERGE: 1.485.1.10
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.485.1.10 +0 -0
        Merge rename: ntpq/invoke-ntpq.texi -> BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.165 +13 -1
        MERGE: 1.161.1.9
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.161.1.9 +0 -0
        Merge rename: ntpd/ntp.conf.html -> BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.485 +0 -2
        MERGE: 1.481.1.10
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.481.1.10 +0 -0
        Merge rename: ntpsnmpd/invoke-ntpsnmpd.texi -> BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.96 +0 -2
        MERGE: 1.92.1.10
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.92.1.10 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.html -> BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.485 +0 -2
        MERGE: 1.481.1.10
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.481.1.10 +0 -0
        Merge rename: ntpd/invoke-ntpd.texi -> BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.314 +0 -2
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.310.1.10 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.mdoc.in -> BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.166 +0 -1
        MERGE: 1.162.1.9
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.162.1.9 +0 -0
        Merge rename: ntpd/ntp.keys.html -> BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.304 +0 -2
        MERGE: 1.300.1.10
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.300.1.10 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.mdoc.in -> BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.304 +0 -3
        MERGE: 1.300.1.9
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.300.1.9 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.man.in -> BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.206 +14 -2
        MERGE: 1.202.1.10
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.202.1.10 +0 -0
        Merge rename: ntpd/ntp.conf.mdoc.in -> BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.42 +0 -2
        MERGE: 1.38.1.10
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.38.1.10 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait-opts -> BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.317 +0 -2
        MERGE: 1.313.1.10
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.313.1.10 +0 -0
        Merge rename: ntpq/ntpq.mdoc.in -> BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.160 +0 -2
        MERGE: 1.156.1.9
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.156.1.9 +0 -0
        Merge rename: ntpd/ntpd.html -> BitKeeper/deleted/93/ntpd.html~fab305284d96b809
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.172 +14 -1
        MERGE: 1.168.1.10
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.168.1.10 +0 -0
        Merge rename: ntpd/invoke-ntp.conf.texi -> BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.95 +0 -3
        MERGE: 1.91.1.9
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.91.1.9 +0 -0
        Merge rename: scripts/summary.man.in -> BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.506 +5 -235
        MERGE: 1.502.1.10
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.502.1.10 +0 -0
        Merge rename: ntpd/ntpd-opts.c -> BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.304 +0 -3
        MERGE: 1.300.1.9
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.300.1.9 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitman -> BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.314 +0 -2
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.310.1.10 +0 -0
        Merge rename: util/ntp-keygen.mdoc.in -> BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.502 +0 -3
        MERGE: 1.498.1.10
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.498.1.10 +0 -0
        Merge rename: util/ntp-keygen-opts.h -> BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.206 +15 -3
        MERGE: 1.202.1.10
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.202.1.10 +0 -0
        Merge rename: ntpd/ntp.conf.man.in -> BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.169 +0 -1
        MERGE: 1.165.1.10
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.165.1.10 +0 -0
        Merge rename: ntpd/invoke-ntp.keys.texi -> BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.206 +14 -2
        MERGE: 1.202.1.10
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.202.1.10 +0 -0
        Merge rename: ntpd/ntp.conf.5mdoc -> BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.314 +0 -2
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.310.1.10 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenmdoc -> BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.304 +0 -2
        MERGE: 1.300.1.10
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.300.1.10 +0 -0
        Merge rename: scripts/ntp-wait/ntp-wait.1ntp-waitmdoc -> BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.95 +0 -2
        MERGE: 1.91.1.9
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.91.1.9 +0 -0
        Merge rename: scripts/summary.1summarymdoc -> BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.314 +0 -2
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.310.1.10 +0 -0
        Merge rename: ntpdc/ntpdc.1ntpdcmdoc -> BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.317 +0 -3
        MERGE: 1.313.1.10
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.313.1.10 +0 -0
        Merge rename: ntpq/ntpq.1ntpqman -> BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.83 +0 -3
        MERGE: 1.79.1.9
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.79.1.9 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep.man.in -> BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.505 +0 -3
        MERGE: 1.501.1.10
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.501.1.10 +0 -0
        Merge rename: ntpd/ntpd-opts.h -> BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.503 +5 -64
        MERGE: 1.499.1.10
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.499.1.10 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.c -> BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.499 +0 -3
        MERGE: 1.495.1.10
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.495.1.10 +0 -0
        Merge rename: sntp/sntp-opts.h -> BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.95 +0 -3
        MERGE: 1.91.1.9
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.91.1.9 +0 -0
        Merge rename: scripts/plot_summary.man.in -> BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.314 +0 -3
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.310.1.10 +0 -0
        Merge rename: util/ntp-keygen.1ntp-keygenman -> BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.83 +0 -2
        MERGE: 1.79.1.10
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.79.1.10 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptracemdoc -> BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.306 +0 -2
        MERGE: 1.302.1.10
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.302.1.10 +0 -0
        Merge rename: scripts/ntp-wait/invoke-ntp-wait.texi -> BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.314 +0 -3
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.310.1.10 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1ntpsnmpdman -> BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.314 +0 -2
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.310.1.10 +0 -0
        Merge rename: ntpdc/ntpdc.mdoc.in -> BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.314 +0 -3
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.310.1.10 +0 -0
        Merge rename: ntpdc/ntpdc.man.in -> BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.314 +0 -3
        MERGE: 1.310.1.10
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.310.1.10 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.man.in -> BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.44 +0 -2
        MERGE: 1.40.1.10
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.40.1.10 +0 -0
        Merge rename: scripts/ntpsweep/ntpsweep-opts -> BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.503 +5 -169
        MERGE: 1.499.1.11
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.499.1.11 +0 -0
        Merge rename: util/ntp-keygen-opts.c -> BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.83 +0 -3
        MERGE: 1.79.1.9
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.79.1.9 +0 -0
        Merge rename: scripts/ntptrace/ntptrace.1ntptraceman -> BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.203 +0 -2
        MERGE: 1.199.1.10
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.199.1.10 +0 -0
        Merge rename: ntpd/ntp.keys.man.in -> BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.482 +0 -2
        MERGE: 1.478.1.10
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.478.1.10 +0 -0
        Merge rename: sntp/invoke-sntp.texi -> BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.500 +0 -3
        MERGE: 1.496.1.10
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.496.1.10 +0 -0
        Merge rename: ntpdc/ntpdc-opts.h -> BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.155 +0 -1
        MERGE: 1.151.1.9
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.151.1.9 +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.html -> BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.95 +0 -2
        MERGE: 1.91.1.9
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.91.1.9 +0 -0
        Merge rename: scripts/plot_summary.mdoc.in -> BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.98 +0 -2
        MERGE: 1.94.1.9
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.94.1.9 +0 -0
        Merge rename: scripts/summary.html -> BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.95 +0 -2
        MERGE: 1.91.1.9
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.91.1.9 +0 -0
        Merge rename: scripts/plot_summary.1plot_summarymdoc -> BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.497 +0 -2
        MERGE: 1.493.1.10
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.493.1.10 +0 -0
        Merge rename: sntp/sntp.html -> BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2
    
      ChangeLog at 1.1597 +1 -1
        Merge cleanup
        MERGE: 1.1593.1.27
    
      configure.ac at 1.582 +0 -0
        Auto merged
        MERGE: 1.579.1.2
    
    ChangeSet at 1.3272, 2015-02-10 04:38:40-05:00, stenn at deacon.udel.edu
      .point-changed-filelist items that are distinct between -stable and -dev.
    
      BitKeeper/deleted/03/ntp.conf.5man~b902e4ff9c45a963 at 1.205 +0 -0
        Delete: ntpd/ntp.conf.5man
    
      BitKeeper/deleted/04/invoke-calc_tickadj.texi~96e91cc6c334aff6 at 1.79 +0 -0
        Delete: scripts/calc_tickadj/invoke-calc_tickadj.texi
    
      BitKeeper/deleted/09/calc_tickadj.1calc_tickadjmdoc~c299822fd8845409 at 1.75 +0 -0
        Delete: scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
    
      BitKeeper/deleted/09/ntp.keys.5mdoc~ee84cd1ca2953725 at 1.202 +0 -0
        Delete: ntpd/ntp.keys.5mdoc
    
      BitKeeper/deleted/0b/invoke-plot_summary.texi~938b5dadb94b207e at 1.96 +0 -0
        Delete: scripts/invoke-plot_summary.texi
    
      BitKeeper/deleted/0c/ntpsweep.1ntpsweepmdoc~bef35d5bb6eb209d at 1.82 +0 -0
        Delete: scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
    
      BitKeeper/deleted/0d/ntpsweep.mdoc.in~16a42483e173f5f7 at 1.83 +0 -0
        Delete: scripts/ntpsweep/ntpsweep.mdoc.in
    
      BitKeeper/deleted/14/ntpd.man.in~826dac7de4dfaf0 at 1.313 +0 -0
        Delete: ntpd/ntpd.man.in
    
      BitKeeper/deleted/17/plot_summary.html~ff3e900e7a9dd643 at 1.97 +0 -0
        Delete: scripts/plot_summary.html
    
      BitKeeper/deleted/18/ntpq-opts.h~9c0f9f2f707349aa at 1.503 +0 -0
        Delete: ntpq/ntpq-opts.h
    
      BitKeeper/deleted/1a/plot_summary.1plot_summaryman~42a0e27f4fb2db6b at 1.94 +0 -0
        Delete: scripts/plot_summary.1plot_summaryman
    
      BitKeeper/deleted/1d/ntptrace-opts~3f78d44be479f332 at 1.43 +0 -0
        Delete: scripts/ntptrace/ntptrace-opts
    
      BitKeeper/deleted/1d/summary-opts~63d1ea8ba00f27 at 1.43 +0 -0
        Delete: scripts/summary-opts
    
      BitKeeper/deleted/21/ntpq.1ntpqmdoc~662154f2595c227f at 1.316 +0 -0
        Delete: ntpq/ntpq.1ntpqmdoc
    
      BitKeeper/deleted/23/ntp.keys.mdoc.in~f8d6b4dd3308c7f at 1.202 +0 -0
        Delete: ntpd/ntp.keys.mdoc.in
    
      BitKeeper/deleted/24/calc_tickadj.html~ee45c3671cb71e93 at 1.77 +0 -0
        Delete: scripts/calc_tickadj/calc_tickadj.html
    
      BitKeeper/deleted/25/calc_tickadj.mdoc.in~54d5bb0f786eb825 at 1.75 +0 -0
        Delete: scripts/calc_tickadj/calc_tickadj.mdoc.in
    
      BitKeeper/deleted/27/ntpsnmpd-opts.h~983602dc8a3419c1 at 1.501 +0 -0
        Delete: ntpsnmpd/ntpsnmpd-opts.h
    
      BitKeeper/deleted/2c/ntpdc-opts.c~2215ecfbf73f69d2 at 1.500 +0 -0
        Delete: ntpdc/ntpdc-opts.c
    
      BitKeeper/deleted/2d/sntp.1sntpman~e6f65dbc1b709af at 1.316 +0 -0
        Delete: sntp/sntp.1sntpman
    
      BitKeeper/deleted/2e/ntpq.html~79b14ff0bbc1b591 at 1.156 +0 -0
        Delete: ntpq/ntpq.html
    
      BitKeeper/deleted/30/ntp-keygen.man.in~203054dcfeaad970 at 1.313 +0 -0
        Delete: util/ntp-keygen.man.in
    
      BitKeeper/deleted/34/plot_summary-opts~ec9e4dccec51110a at 1.43 +0 -0
        Delete: scripts/plot_summary-opts
    
      BitKeeper/deleted/3d/calc_tickadj.man.in~8d3dc58696ea64de at 1.74 +0 -0
        Delete: scripts/calc_tickadj/calc_tickadj.man.in
    
      BitKeeper/deleted/3f/invoke-ntptrace.texi~a6d08694b81e2a19 at 1.94 +0 -0
        Delete: scripts/ntptrace/invoke-ntptrace.texi
    
      BitKeeper/deleted/3f/ntp.keys.5man~401cb5f44ce7ad07 at 1.202 +0 -0
        Delete: ntpd/ntp.keys.5man
    
      BitKeeper/deleted/42/ntpq-opts.c~a843905452e70b64 at 1.505 +0 -0
        Delete: ntpq/ntpq-opts.c
    
      BitKeeper/deleted/45/ntptrace.mdoc.in~ffefad7dc4f07269 at 1.83 +0 -0
        Delete: scripts/ntptrace/ntptrace.mdoc.in
    
      BitKeeper/deleted/46/ntpsnmpd.1ntpsnmpdmdoc~4e6c03fefb2e7b78 at 1.313 +0 -0
        Delete: ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
    
      BitKeeper/deleted/49/packageinfo.sh~aa8bfb67965f2b88 at 1.499 +0 -0
        Delete: packageinfo.sh
    
      BitKeeper/deleted/4d/invoke-summary.texi~a5c152d640a4c7f0 at 1.96 +0 -0
        Delete: scripts/invoke-summary.texi
    
      BitKeeper/deleted/4d/ntpdc.1ntpdcman~ce1f9c4ff0a18ae6 at 1.313 +0 -0
        Delete: ntpdc/ntpdc.1ntpdcman
    
      BitKeeper/deleted/4d/sntp-opts.c~de1b6bd54ad699ca at 1.499 +0 -0
        Delete: sntp/sntp-opts.c
    
      BitKeeper/deleted/51/sntp.mdoc.in~fac68e57291961f4 at 1.316 +0 -0
        Delete: sntp/sntp.mdoc.in
    
      BitKeeper/deleted/53/ntpd.1ntpdman~955f74291669fc05 at 1.313 +0 -0
        Delete: ntpd/ntpd.1ntpdman
    
      BitKeeper/deleted/5a/ntpd.mdoc.in~f3ea65929f12c0a6 at 1.313 +0 -0
        Delete: ntpd/ntpd.mdoc.in
    
      BitKeeper/deleted/5b/ntpdc.html~64d3e0039640bfb7 at 1.326 +0 -0
        Delete: ntpdc/ntpdc.html
    
      BitKeeper/deleted/5c/calc_tickadj.1calc_tickadjman~2f59f8e4328be5d at 1.75 +0 -0
        Delete: scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
    
      BitKeeper/deleted/5d/ntp-wait.html~e9a9c4aa48a3da13 at 1.322 +0 -0
        Delete: scripts/ntp-wait/ntp-wait.html
    
      BitKeeper/deleted/68/summary.1summaryman~5f409c2a949ea9b0 at 1.94 +0 -0
        Delete: scripts/summary.1summaryman
    
      BitKeeper/deleted/71/summary.mdoc.in~6b239e20ffd79ab0 at 1.94 +0 -0
        Delete: scripts/summary.mdoc.in
    
      BitKeeper/deleted/72/sntp.1sntpmdoc~c3ab721a8a620e36 at 1.316 +0 -0
        Delete: sntp/sntp.1sntpmdoc
    
      BitKeeper/deleted/74/ntpd.1ntpdmdoc~1f893ae3c305a616 at 1.313 +0 -0
        Delete: ntpd/ntpd.1ntpdmdoc
    
      BitKeeper/deleted/77/ntp-keygen.html~95e506a1f2c6fc2a at 1.160 +0 -0
        Delete: util/ntp-keygen.html
    
      BitKeeper/deleted/78/ntpq.man.in~21572cf3b6a5c1ec at 1.316 +0 -0
        Delete: ntpq/ntpq.man.in
    
      BitKeeper/deleted/7b/ntpsweep.1ntpsweepman~d629d1224ab12de3 at 1.82 +0 -0
        Delete: scripts/ntpsweep/ntpsweep.1ntpsweepman
    
      BitKeeper/deleted/7e/invoke-ntpsweep.texi~ed7b1b77b4dfa328 at 1.94 +0 -0
        Delete: scripts/ntpsweep/invoke-ntpsweep.texi
    
      BitKeeper/deleted/7e/sntp.man.in~3fa477b869a1b956 at 1.316 +0 -0
        Delete: sntp/sntp.man.in
    
      BitKeeper/deleted/7f/ntpsweep.html~eeade958fb99c64f at 1.95 +0 -0
        Delete: scripts/ntpsweep/ntpsweep.html
    
      BitKeeper/deleted/80/ntpdc-opts.texi~6249f1e2d6e809d2 at 1.482 +0 -0
        Delete: ntpdc/invoke-ntpdc.texi
    
      BitKeeper/deleted/80/ntptrace.man.in~434e8b66c18b4e6b at 1.82 +0 -0
        Delete: scripts/ntptrace/ntptrace.man.in
    
      BitKeeper/deleted/82/ntp-keygen-opts.texi~94a76fbb34b00c92 at 1.485 +0 -0
        Delete: util/invoke-ntp-keygen.texi
    
      BitKeeper/deleted/82/ntpq-opts.texi~fad6e143da59f684 at 1.488 +0 -0
        Delete: ntpq/invoke-ntpq.texi
    
      BitKeeper/deleted/85/ntp.conf.html~7c7d92dcc0757506 at 1.164 +0 -0
        Delete: ntpd/ntp.conf.html
    
      BitKeeper/deleted/85/ntpsnmpd-opts.texi~822ff2b5d00be06e at 1.484 +0 -0
        Delete: ntpsnmpd/invoke-ntpsnmpd.texi
    
      BitKeeper/deleted/87/ntptrace.html~dbd14557c0c7d497 at 1.95 +0 -0
        Delete: scripts/ntptrace/ntptrace.html
    
      BitKeeper/deleted/88/ntpd-opts.texi~d18ffe8ba6dba5cc at 1.484 +0 -0
        Delete: ntpd/invoke-ntpd.texi
    
      BitKeeper/deleted/89/ntpsnmpd.mdoc.in~b522eb1b23c4b666 at 1.313 +0 -0
        Delete: ntpsnmpd/ntpsnmpd.mdoc.in
    
      BitKeeper/deleted/8c/ntp.keys.html~51f3e5919d5d9187 at 1.165 +0 -0
        Delete: ntpd/ntp.keys.html
    
      BitKeeper/deleted/8d/ntp-wait.mdoc.in~c88db14064a30a64 at 1.303 +0 -0
        Delete: scripts/ntp-wait/ntp-wait.mdoc.in
    
      BitKeeper/deleted/90/ntp-wait.man.in~8aa197a726531fa4 at 1.303 +0 -0
        Delete: scripts/ntp-wait/ntp-wait.man.in
    
      BitKeeper/deleted/90/ntp.conf.mdoc.in~2db8e6c37d2d851f at 1.205 +0 -0
        Delete: ntpd/ntp.conf.mdoc.in
    
      BitKeeper/deleted/91/ntp-wait-opts~4aad627e65e8b71e at 1.41 +0 -0
        Delete: scripts/ntp-wait/ntp-wait-opts
    
      BitKeeper/deleted/91/ntpq.mdoc.in~14edfe542c87b106 at 1.316 +0 -0
        Delete: ntpq/ntpq.mdoc.in
    
      BitKeeper/deleted/93/ntpd.html~fab305284d96b809 at 1.159 +0 -0
        Delete: ntpd/ntpd.html
    
      BitKeeper/deleted/95/invoke-ntp.conf.texi~d9b3b1741f011c6 at 1.171 +0 -0
        Delete: ntpd/invoke-ntp.conf.texi
    
      BitKeeper/deleted/99/summary.man.in~810a90a3bf7402d8 at 1.94 +0 -0
        Delete: scripts/summary.man.in
    
      BitKeeper/deleted/9c/ntpd-opts.c~153458d1f5b0abe0 at 1.505 +0 -0
        Delete: ntpd/ntpd-opts.c
    
      BitKeeper/deleted/9f/ntp-wait.1ntp-waitman~14a37c1a3b33b693 at 1.303 +0 -0
        Delete: scripts/ntp-wait/ntp-wait.1ntp-waitman
    
      BitKeeper/deleted/a0/ntp-keygen.mdoc.in~2f6df2d427f808be at 1.313 +0 -0
        Delete: util/ntp-keygen.mdoc.in
    
      BitKeeper/deleted/a1/ntp-keygen-opts.h~3bb11bd0d08ce88a at 1.501 +0 -0
        Delete: util/ntp-keygen-opts.h
    
      BitKeeper/deleted/a5/ntp.conf.man.in~e6b327b2ba9c7f9 at 1.205 +0 -0
        Delete: ntpd/ntp.conf.man.in
    
      BitKeeper/deleted/a9/invoke-ntp.keys.texi~20813dc425a01f94 at 1.168 +0 -0
        Delete: ntpd/invoke-ntp.keys.texi
    
      BitKeeper/deleted/a9/ntp.conf.5mdoc~394a59a7e63cd348 at 1.205 +0 -0
        Delete: ntpd/ntp.conf.5mdoc
    
      BitKeeper/deleted/aa/ntp-keygen.1ntp-keygenmdoc~15ff4c8182d11987 at 1.313 +0 -0
        Delete: util/ntp-keygen.1ntp-keygenmdoc
    
      BitKeeper/deleted/ad/ntp-wait.1ntp-waitmdoc~81bab36eaf0d2c89 at 1.303 +0 -0
        Delete: scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
    
      BitKeeper/deleted/b2/summary.1summarymdoc~889a12954a7f0b68 at 1.94 +0 -0
        Delete: scripts/summary.1summarymdoc
    
      BitKeeper/deleted/b3/ntpdc.1ntpdcmdoc~7dfe629aae750d6b at 1.313 +0 -0
        Delete: ntpdc/ntpdc.1ntpdcmdoc
    
      BitKeeper/deleted/b3/ntpq.1ntpqman~bb47e0e21a05f8ec at 1.316 +0 -0
        Delete: ntpq/ntpq.1ntpqman
    
      BitKeeper/deleted/b3/ntpsweep.man.in~c3d36d37626278c4 at 1.82 +0 -0
        Delete: scripts/ntpsweep/ntpsweep.man.in
    
      BitKeeper/deleted/b9/ntpd-opts.h~f63146e03249472f at 1.504 +0 -0
        Delete: ntpd/ntpd-opts.h
    
      BitKeeper/deleted/bf/ntpsnmpd-opts.c~2e73b13981df09b6 at 1.502 +0 -0
        Delete: ntpsnmpd/ntpsnmpd-opts.c
    
      BitKeeper/deleted/c2/sntp-opts.h~f56e9792c6c7bcf4 at 1.498 +0 -0
        Delete: sntp/sntp-opts.h
    
      BitKeeper/deleted/c4/plot_summary.man.in~361ed608429f5d2d at 1.94 +0 -0
        Delete: scripts/plot_summary.man.in
    
      BitKeeper/deleted/c6/ntp-keygen.1ntp-keygenman~a2ddfe2d66b6c6b1 at 1.313 +0 -0
        Delete: util/ntp-keygen.1ntp-keygenman
    
      BitKeeper/deleted/c7/ntptrace.1ntptracemdoc~ab22c8e75948a2ec at 1.82 +0 -0
        Delete: scripts/ntptrace/ntptrace.1ntptracemdoc
    
      BitKeeper/deleted/c9/ntp-wait-opts.texi~449bd2b289ed8e8d at 1.305 +0 -0
        Delete: scripts/ntp-wait/invoke-ntp-wait.texi
    
      BitKeeper/deleted/c9/ntpsnmpd.1ntpsnmpdman~8446e86abbcf207e at 1.313 +0 -0
        Delete: ntpsnmpd/ntpsnmpd.1ntpsnmpdman
    
      BitKeeper/deleted/ca/ntpdc.mdoc.in~787db3577a22cab4 at 1.313 +0 -0
        Delete: ntpdc/ntpdc.mdoc.in
    
      BitKeeper/deleted/d1/ntpdc.man.in~2899b62771fead6d at 1.313 +0 -0
        Delete: ntpdc/ntpdc.man.in
    
      BitKeeper/deleted/d8/ntpsnmpd.man.in~4e118b2ed7fe15a9 at 1.313 +0 -0
        Delete: ntpsnmpd/ntpsnmpd.man.in
    
      BitKeeper/deleted/e1/ntpsweep-opts~f63512bb1b556aa at 1.43 +0 -0
        Delete: scripts/ntpsweep/ntpsweep-opts
    
      BitKeeper/deleted/e2/ntp-keygen-opts.c~4f0fef7931c3b84a at 1.502 +0 -0
        Delete: util/ntp-keygen-opts.c
    
      BitKeeper/deleted/e4/ntptrace.1ntptraceman~c202c7f14fbb4b34 at 1.82 +0 -0
        Delete: scripts/ntptrace/ntptrace.1ntptraceman
    
      BitKeeper/deleted/ef/ntp.keys.man.in~d75ce7ba6b342009 at 1.202 +0 -0
        Delete: ntpd/ntp.keys.man.in
    
      BitKeeper/deleted/f0/sntp-opts.texi~4bd0e8414986e866 at 1.481 +0 -0
        Delete: sntp/invoke-sntp.texi
    
      BitKeeper/deleted/f2/ntpdc-opts.h~8e7b6a35c6cf3d at 1.499 +0 -0
        Delete: ntpdc/ntpdc-opts.h
    
      BitKeeper/deleted/f3/ntpsnmpd.html~824bf0cefb5be910 at 1.154 +0 -0
        Delete: ntpsnmpd/ntpsnmpd.html
    
      BitKeeper/deleted/f3/plot_summary.mdoc.in~d1882968e1e2e762 at 1.94 +0 -0
        Delete: scripts/plot_summary.mdoc.in
    
      BitKeeper/deleted/f3/summary.html~fe3fb0b36f6c8e6 at 1.97 +0 -0
        Delete: scripts/summary.html
    
      BitKeeper/deleted/f9/plot_summary.1plot_summarymdoc~87b94d5ffa135908 at 1.94 +0 -0
        Delete: scripts/plot_summary.1plot_summarymdoc
    
      BitKeeper/deleted/fe/sntp.html~afe5facbee531eb2 at 1.496 +0 -0
        Delete: sntp/sntp.html
    
      ntpd/invoke-ntp.conf.texi at 1.1 +2634 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/invoke-ntp.conf.texi
    
      ntpd/invoke-ntp.conf.texi at 1.0 +0 -0
    
      ntpd/invoke-ntp.keys.texi at 1.1 +125 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/invoke-ntp.keys.texi
    
      ntpd/invoke-ntp.keys.texi at 1.0 +0 -0
    
      ntpd/invoke-ntpd.texi at 1.1 +702 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/invoke-ntpd.texi
    
      ntpd/invoke-ntpd.texi at 1.0 +0 -0
    
      ntpd/ntp.conf.5man at 1.1 +3004 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntp.conf.5man
    
      ntpd/ntp.conf.5man at 1.0 +0 -0
    
      ntpd/ntp.conf.5mdoc at 1.1 +2808 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntp.conf.5mdoc
    
      ntpd/ntp.conf.5mdoc at 1.0 +0 -0
    
      ntpd/ntp.conf.html at 1.1 +2625 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntp.conf.html
    
      ntpd/ntp.conf.html at 1.0 +0 -0
    
      ntpd/ntp.conf.man.in at 1.1 +3004 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntp.conf.man.in
    
      ntpd/ntp.conf.man.in at 1.0 +0 -0
    
      ntpd/ntp.conf.mdoc.in at 1.1 +2808 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntp.conf.mdoc.in
    
      ntpd/ntp.conf.mdoc.in at 1.0 +0 -0
    
      ntpd/ntp.keys.5man at 1.1 +173 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntp.keys.5man
    
      ntpd/ntp.keys.5man at 1.0 +0 -0
    
      ntpd/ntp.keys.5mdoc at 1.1 +158 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntp.keys.5mdoc
    
      ntpd/ntp.keys.5mdoc at 1.0 +0 -0
    
      ntpd/ntp.keys.html at 1.1 +200 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntp.keys.html
    
      ntpd/ntp.keys.html at 1.0 +0 -0
    
      ntpd/ntp.keys.man.in at 1.1 +173 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntp.keys.man.in
    
      ntpd/ntp.keys.man.in at 1.0 +0 -0
    
      ntpd/ntp.keys.mdoc.in at 1.1 +158 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntp.keys.mdoc.in
    
      ntpd/ntp.keys.mdoc.in at 1.0 +0 -0
    
      ntpd/ntpd-opts.c at 1.1 +1952 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntpd-opts.c
    
      ntpd/ntpd-opts.c at 1.0 +0 -0
    
      ntpd/ntpd-opts.h at 1.1 +458 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntpd-opts.h
    
      ntpd/ntpd-opts.h at 1.0 +0 -0
    
      ntpd/ntpd.1ntpdman at 1.1 +987 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntpd.1ntpdman
    
      ntpd/ntpd.1ntpdman at 1.0 +0 -0
    
      ntpd/ntpd.1ntpdmdoc at 1.1 +891 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntpd.1ntpdmdoc
    
      ntpd/ntpd.1ntpdmdoc at 1.0 +0 -0
    
      ntpd/ntpd.html at 1.1 +995 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntpd.html
    
      ntpd/ntpd.html at 1.0 +0 -0
    
      ntpd/ntpd.man.in at 1.1 +987 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntpd.man.in
    
      ntpd/ntpd.man.in at 1.0 +0 -0
    
      ntpd/ntpd.mdoc.in at 1.1 +891 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpd/ntpd.mdoc.in
    
      ntpd/ntpd.mdoc.in at 1.0 +0 -0
    
      ntpdc/invoke-ntpdc.texi at 1.1 +349 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpdc/invoke-ntpdc.texi
    
      ntpdc/invoke-ntpdc.texi at 1.0 +0 -0
    
      ntpdc/ntpdc-opts.c at 1.1 +1173 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpdc/ntpdc-opts.c
    
      ntpdc/ntpdc-opts.c at 1.0 +0 -0
    
      ntpdc/ntpdc-opts.h at 1.1 +294 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpdc/ntpdc-opts.h
    
      ntpdc/ntpdc-opts.h at 1.0 +0 -0
    
      ntpdc/ntpdc.1ntpdcman at 1.1 +874 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpdc/ntpdc.1ntpdcman
    
      ntpdc/ntpdc.1ntpdcman at 1.0 +0 -0
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.1 +809 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpdc/ntpdc.1ntpdcmdoc
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.0 +0 -0
    
      ntpdc/ntpdc.html at 1.1 +515 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpdc/ntpdc.html
    
      ntpdc/ntpdc.html at 1.0 +0 -0
    
      ntpdc/ntpdc.man.in at 1.1 +874 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpdc/ntpdc.man.in
    
      ntpdc/ntpdc.man.in at 1.0 +0 -0
    
      ntpdc/ntpdc.mdoc.in at 1.1 +809 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpdc/ntpdc.mdoc.in
    
      ntpdc/ntpdc.mdoc.in at 1.0 +0 -0
    
      ntpq/invoke-ntpq.texi at 1.1 +1086 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpq/invoke-ntpq.texi
    
      ntpq/invoke-ntpq.texi at 1.0 +0 -0
    
      ntpq/ntpq-opts.c at 1.1 +1160 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpq/ntpq-opts.c
    
      ntpq/ntpq-opts.c at 1.0 +0 -0
    
      ntpq/ntpq-opts.h at 1.1 +294 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpq/ntpq-opts.h
    
      ntpq/ntpq-opts.h at 1.0 +0 -0
    
      ntpq/ntpq.1ntpqman at 1.1 +1408 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpq/ntpq.1ntpqman
    
      ntpq/ntpq.1ntpqman at 1.0 +0 -0
    
      ntpq/ntpq.1ntpqmdoc at 1.1 +954 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpq/ntpq.1ntpqmdoc
    
      ntpq/ntpq.1ntpqmdoc at 1.0 +0 -0
    
      ntpq/ntpq.html at 1.1 +1814 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpq/ntpq.html
    
      ntpq/ntpq.html at 1.0 +0 -0
    
      ntpq/ntpq.man.in at 1.1 +1408 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpq/ntpq.man.in
    
      ntpq/ntpq.man.in at 1.0 +0 -0
    
      ntpq/ntpq.mdoc.in at 1.1 +954 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpq/ntpq.mdoc.in
    
      ntpq/ntpq.mdoc.in at 1.0 +0 -0
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.1 +188 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpsnmpd/invoke-ntpsnmpd.texi
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.0 +0 -0
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.1 +910 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpsnmpd/ntpsnmpd-opts.c
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.0 +0 -0
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.1 +243 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpsnmpd/ntpsnmpd-opts.h
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.0 +0 -0
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.1 +203 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.0 +0 -0
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.1 +144 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.0 +0 -0
    
      ntpsnmpd/ntpsnmpd.html at 1.1 +79 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpsnmpd/ntpsnmpd.html
    
      ntpsnmpd/ntpsnmpd.html at 1.0 +0 -0
    
      ntpsnmpd/ntpsnmpd.man.in at 1.1 +203 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpsnmpd/ntpsnmpd.man.in
    
      ntpsnmpd/ntpsnmpd.man.in at 1.0 +0 -0
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.1 +144 -0
        BitKeeper file /deacon/backroom/ntp-dev/ntpsnmpd/ntpsnmpd.mdoc.in
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.0 +0 -0
    
      packageinfo.sh at 1.1 +111 -0
        BitKeeper file /deacon/backroom/ntp-dev/packageinfo.sh
    
      packageinfo.sh at 1.0 +0 -0
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.1 +108 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.0 +0 -0
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.1 +84 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.0 +0 -0
    
      scripts/calc_tickadj/calc_tickadj.html at 1.1 +166 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/calc_tickadj/calc_tickadj.html
    
      scripts/calc_tickadj/calc_tickadj.html at 1.0 +0 -0
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.1 +108 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/calc_tickadj/calc_tickadj.man.in
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.0 +0 -0
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.1 +84 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/calc_tickadj/calc_tickadj.mdoc.in
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.0 +0 -0
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.1 +102 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/calc_tickadj/invoke-calc_tickadj.texi
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.0 +0 -0
    
      scripts/invoke-plot_summary.texi at 1.1 +121 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/invoke-plot_summary.texi
    
      scripts/invoke-plot_summary.texi at 1.0 +0 -0
    
      scripts/invoke-summary.texi at 1.1 +103 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/invoke-summary.texi
    
      scripts/invoke-summary.texi at 1.0 +0 -0
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.1 +114 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntp-wait/invoke-ntp-wait.texi
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.0 +0 -0
    
      scripts/ntp-wait/ntp-wait-opts at 1.1 +62 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntp-wait/ntp-wait-opts
    
      scripts/ntp-wait/ntp-wait-opts at 1.0 +0 -0
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.1 +122 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntp-wait/ntp-wait.1ntp-waitman
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.0 +0 -0
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.1 +95 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.0 +0 -0
    
      scripts/ntp-wait/ntp-wait.html at 1.1 +208 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntp-wait/ntp-wait.html
    
      scripts/ntp-wait/ntp-wait.html at 1.0 +0 -0
    
      scripts/ntp-wait/ntp-wait.man.in at 1.1 +122 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntp-wait/ntp-wait.man.in
    
      scripts/ntp-wait/ntp-wait.man.in at 1.0 +0 -0
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.1 +95 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntp-wait/ntp-wait.mdoc.in
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.0 +0 -0
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.1 +118 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntpsweep/invoke-ntpsweep.texi
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.0 +0 -0
    
      scripts/ntpsweep/ntpsweep-opts at 1.1 +67 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntpsweep/ntpsweep-opts
    
      scripts/ntpsweep/ntpsweep-opts at 1.0 +0 -0
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.1 +97 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntpsweep/ntpsweep.1ntpsweepman
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.0 +0 -0
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.1 +75 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.0 +0 -0
    
      scripts/ntpsweep/ntpsweep.html at 1.1 +201 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntpsweep/ntpsweep.html
    
      scripts/ntpsweep/ntpsweep.html at 1.0 +0 -0
    
      scripts/ntpsweep/ntpsweep.man.in at 1.1 +97 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntpsweep/ntpsweep.man.in
    
      scripts/ntpsweep/ntpsweep.man.in at 1.0 +0 -0
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.1 +75 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntpsweep/ntpsweep.mdoc.in
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.0 +0 -0
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.1 +109 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntptrace/invoke-ntptrace.texi
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.0 +0 -0
    
      scripts/ntptrace/ntptrace-opts at 1.1 +62 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntptrace/ntptrace-opts
    
      scripts/ntptrace/ntptrace-opts at 1.0 +0 -0
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.1 +114 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntptrace/ntptrace.1ntptraceman
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.0 +0 -0
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.1 +91 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntptrace/ntptrace.1ntptracemdoc
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.0 +0 -0
    
      scripts/ntptrace/ntptrace.html at 1.1 +180 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntptrace/ntptrace.html
    
      scripts/ntptrace/ntptrace.html at 1.0 +0 -0
    
      scripts/ntptrace/ntptrace.man.in at 1.1 +114 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntptrace/ntptrace.man.in
    
      scripts/ntptrace/ntptrace.man.in at 1.0 +0 -0
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.1 +91 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/ntptrace/ntptrace.mdoc.in
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.0 +0 -0
    
      scripts/plot_summary-opts at 1.1 +73 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/plot_summary-opts
    
      scripts/plot_summary-opts at 1.0 +0 -0
    
      scripts/plot_summary.1plot_summaryman at 1.1 +114 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/plot_summary.1plot_summaryman
    
      scripts/plot_summary.1plot_summaryman at 1.0 +0 -0
    
      scripts/plot_summary.1plot_summarymdoc at 1.1 +88 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/plot_summary.1plot_summarymdoc
    
      scripts/plot_summary.1plot_summarymdoc at 1.0 +0 -0
    
      scripts/plot_summary.html at 1.1 +207 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/plot_summary.html
    
      scripts/plot_summary.html at 1.0 +0 -0
    
      scripts/plot_summary.man.in at 1.1 +114 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/plot_summary.man.in
    
      scripts/plot_summary.man.in at 1.0 +0 -0
    
      scripts/plot_summary.mdoc.in at 1.1 +88 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/plot_summary.mdoc.in
    
      scripts/plot_summary.mdoc.in at 1.0 +0 -0
    
      scripts/summary-opts at 1.1 +69 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/summary-opts
    
      scripts/summary-opts at 1.0 +0 -0
    
      scripts/summary.1summaryman at 1.1 +123 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/summary.1summaryman
    
      scripts/summary.1summaryman at 1.0 +0 -0
    
      scripts/summary.1summarymdoc at 1.1 +98 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/summary.1summarymdoc
    
      scripts/summary.1summarymdoc at 1.0 +0 -0
    
      scripts/summary.html at 1.1 +182 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/summary.html
    
      scripts/summary.html at 1.0 +0 -0
    
      scripts/summary.man.in at 1.1 +123 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/summary.man.in
    
      scripts/summary.man.in at 1.0 +0 -0
    
      scripts/summary.mdoc.in at 1.1 +98 -0
        BitKeeper file /deacon/backroom/ntp-dev/scripts/summary.mdoc.in
    
      scripts/summary.mdoc.in at 1.0 +0 -0
    
      sntp/invoke-sntp.texi at 1.1 +427 -0
        BitKeeper file /deacon/backroom/ntp-dev/sntp/invoke-sntp.texi
    
      sntp/invoke-sntp.texi at 1.0 +0 -0
    
      sntp/sntp-opts.c at 1.1 +1573 -0
        BitKeeper file /deacon/backroom/ntp-dev/sntp/sntp-opts.c
    
      sntp/sntp-opts.c at 1.0 +0 -0
    
      sntp/sntp-opts.h at 1.1 +370 -0
        BitKeeper file /deacon/backroom/ntp-dev/sntp/sntp-opts.h
    
      sntp/sntp-opts.h at 1.0 +0 -0
    
      sntp/sntp.1sntpman at 1.1 +340 -0
        BitKeeper file /deacon/backroom/ntp-dev/sntp/sntp.1sntpman
    
      sntp/sntp.1sntpman at 1.0 +0 -0
    
      sntp/sntp.1sntpmdoc at 1.1 +296 -0
        BitKeeper file /deacon/backroom/ntp-dev/sntp/sntp.1sntpmdoc
    
      sntp/sntp.1sntpmdoc at 1.0 +0 -0
    
      sntp/sntp.html at 1.1 +621 -0
        BitKeeper file /deacon/backroom/ntp-dev/sntp/sntp.html
    
      sntp/sntp.html at 1.0 +0 -0
    
      sntp/sntp.man.in at 1.1 +340 -0
        BitKeeper file /deacon/backroom/ntp-dev/sntp/sntp.man.in
    
      sntp/sntp.man.in at 1.0 +0 -0
    
      sntp/sntp.mdoc.in at 1.1 +296 -0
        BitKeeper file /deacon/backroom/ntp-dev/sntp/sntp.mdoc.in
    
      sntp/sntp.mdoc.in at 1.0 +0 -0
    
      util/invoke-ntp-keygen.texi at 1.1 +1354 -0
        BitKeeper file /deacon/backroom/ntp-dev/util/invoke-ntp-keygen.texi
    
      util/invoke-ntp-keygen.texi at 1.0 +0 -0
    
      util/ntp-keygen-opts.c at 1.1 +1719 -0
        BitKeeper file /deacon/backroom/ntp-dev/util/ntp-keygen-opts.c
    
      util/ntp-keygen-opts.c at 1.0 +0 -0
    
      util/ntp-keygen-opts.h at 1.1 +386 -0
        BitKeeper file /deacon/backroom/ntp-dev/util/ntp-keygen-opts.h
    
      util/ntp-keygen-opts.h at 1.0 +0 -0
    
      util/ntp-keygen.1ntp-keygenman at 1.1 +1221 -0
        BitKeeper file /deacon/backroom/ntp-dev/util/ntp-keygen.1ntp-keygenman
    
      util/ntp-keygen.1ntp-keygenman at 1.0 +0 -0
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.1 +1071 -0
        BitKeeper file /deacon/backroom/ntp-dev/util/ntp-keygen.1ntp-keygenmdoc
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.0 +0 -0
    
      util/ntp-keygen.html at 1.1 +1811 -0
        BitKeeper file /deacon/backroom/ntp-dev/util/ntp-keygen.html
    
      util/ntp-keygen.html at 1.0 +0 -0
    
      util/ntp-keygen.man.in at 1.1 +1221 -0
        BitKeeper file /deacon/backroom/ntp-dev/util/ntp-keygen.man.in
    
      util/ntp-keygen.man.in at 1.0 +0 -0
    
      util/ntp-keygen.mdoc.in at 1.1 +1071 -0
        BitKeeper file /deacon/backroom/ntp-dev/util/ntp-keygen.mdoc.in
    
      util/ntp-keygen.mdoc.in at 1.0 +0 -0
    
    ChangeSet at 1.3271, 2015-01-24 02:54:09+00:00, stenn at psp-deb1.ntp.org
      use -dev packageinfo.sh
    
      packageinfo.sh at 1.498 +4 -4
        use -dev packageinfo.sh
    
    ChangeSet at 1.3270, 2015-01-24 02:49:24+00:00, stenn at psp-deb1.ntp.org
      Use -dev versions of the documentation files.
      MERGE: 1.3265.9.5
    
      ChangeLog at 1.1596, stenn at psp-fb1.ntp.org +1 -2
        Merge cleanup
        MERGE: 1.1593.8.5
    
      configure.ac at 1.579.1.2, stenn at psp-fb1.ntp.org +0 -1
        Auto merged
        MERGE: 1.578.1.1
    
      ntpd/invoke-ntp.conf.texi at 1.170, stenn at psp-fb1.ntp.org +0 -15
        Use ntp-dev version
        MERGE: 1.168.1.5
    
      ntpd/invoke-ntp.keys.texi at 1.167 +0 -1
        Use -dev versions of the documentation files.
        MERGE: 1.165.1.5
    
      ntpd/invoke-ntpd.texi at 1.483 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.481.1.5
    
      ntpd/ntp.conf.5man at 1.204 +0 -18
        Use -dev versions of the documentation files.
        MERGE: 1.202.1.5
    
      ntpd/ntp.conf.5mdoc at 1.204 +1 -16
        Use -dev versions of the documentation files.
        MERGE: 1.202.1.5
    
      ntpd/ntp.conf.html at 1.163 +0 -14
        Use -dev versions of the documentation files.
        MERGE: 1.161.1.5
    
      ntpd/ntp.conf.man.in at 1.204 +0 -18
        Use -dev versions of the documentation files.
        MERGE: 1.202.1.5
    
      ntpd/ntp.conf.mdoc.in at 1.204 +1 -16
        Use -dev versions of the documentation files.
        MERGE: 1.202.1.5
    
      ntpd/ntp.keys.5man at 1.201 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.199.1.5
    
      ntpd/ntp.keys.5mdoc at 1.201 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.199.1.5
    
      ntpd/ntp.keys.html at 1.164 +0 -1
        Use -dev versions of the documentation files.
        MERGE: 1.162.1.5
    
      ntpd/ntp.keys.man.in at 1.201 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.199.1.5
    
      ntpd/ntp.keys.mdoc.in at 1.201 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.199.1.5
    
      ntpd/ntpd-opts.c at 1.504 +0 -239
        Use -dev versions of the documentation files.
        MERGE: 1.502.1.5
    
      ntpd/ntpd-opts.h at 1.503 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.501.1.5
    
      ntpd/ntpd.1ntpdman at 1.312 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpd/ntpd.1ntpdmdoc at 1.312 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpd/ntpd.html at 1.158 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.156.1.5
    
      ntpd/ntpd.man.in at 1.312 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpd/ntpd.mdoc.in at 1.312 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpdc/invoke-ntpdc.texi at 1.481 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.479.1.5
    
      ntpdc/ntpdc-opts.c at 1.499 +0 -107
        Use -dev versions of the documentation files.
        MERGE: 1.497.1.5
    
      ntpdc/ntpdc-opts.h at 1.498 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.496.1.5
    
      ntpdc/ntpdc.1ntpdcman at 1.312 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.312 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpdc/ntpdc.html at 1.325 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.323.1.5
    
      ntpdc/ntpdc.man.in at 1.312 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpdc/ntpdc.mdoc.in at 1.312 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpq/invoke-ntpq.texi at 1.487 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.485.1.5
    
      ntpq/ntpq-opts.c at 1.504 +0 -106
        Use -dev versions of the documentation files.
        MERGE: 1.502.1.5
    
      ntpq/ntpq-opts.h at 1.502 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.500.1.5
    
      ntpq/ntpq.1ntpqman at 1.315 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.313.1.5
    
      ntpq/ntpq.1ntpqmdoc at 1.315 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.313.1.5
    
      ntpq/ntpq.html at 1.155 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.153.1.5
    
      ntpq/ntpq.man.in at 1.315 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.313.1.5
    
      ntpq/ntpq.mdoc.in at 1.315 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.313.1.5
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.483 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.481.1.5
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.501 +0 -68
        Use -dev versions of the documentation files.
        MERGE: 1.499.1.5
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.500 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.498.1.5
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.312 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.312 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpsnmpd/ntpsnmpd.html at 1.153 +0 -1
        Use -dev versions of the documentation files.
        MERGE: 1.151.1.5
    
      ntpsnmpd/ntpsnmpd.man.in at 1.312 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.312 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      packageinfo.sh at 1.497, stenn at psp-fb1.ntp.org +0 -1
        Auto merged
        MERGE: 1.492.1.7
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.74 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.72.1.5
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.74 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.72.1.5
    
      scripts/calc_tickadj/calc_tickadj.html at 1.76 +0 -1
        Use -dev versions of the documentation files.
        MERGE: 1.74.1.5
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.73 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.71.1.5
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.74 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.72.1.5
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.78 +0 -1
        Use -dev versions of the documentation files.
        MERGE: 1.76.1.5
    
      scripts/invoke-plot_summary.texi at 1.95 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.93.1.5
    
      scripts/invoke-summary.texi at 1.95 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.93.1.5
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.304 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.302.1.5
    
      scripts/ntp-wait/ntp-wait-opts at 1.40 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.38.1.5
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.302 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.300.1.5
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.302 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.300.1.5
    
      scripts/ntp-wait/ntp-wait.html at 1.321 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.319.1.5
    
      scripts/ntp-wait/ntp-wait.man.in at 1.302 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.300.1.5
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.302 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.300.1.5
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.93 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.91.1.5
    
      scripts/ntpsweep/ntpsweep-opts at 1.42 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.40.1.5
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.81 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.79.1.5
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.81 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.79.1.5
    
      scripts/ntpsweep/ntpsweep.html at 1.94 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.92.1.5
    
      scripts/ntpsweep/ntpsweep.man.in at 1.81 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.79.1.5
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.82 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.80.1.5
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.93 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.91.1.5
    
      scripts/ntptrace/ntptrace-opts at 1.42 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.40.1.5
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.81 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.79.1.5
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.81 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.79.1.5
    
      scripts/ntptrace/ntptrace.html at 1.94 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.92.1.5
    
      scripts/ntptrace/ntptrace.man.in at 1.81 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.79.1.5
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.82 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.80.1.5
    
      scripts/plot_summary-opts at 1.42 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.40.1.5
    
      scripts/plot_summary.1plot_summaryman at 1.93 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.91.1.5
    
      scripts/plot_summary.1plot_summarymdoc at 1.93 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.91.1.5
    
      scripts/plot_summary.html at 1.96 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.94.1.5
    
      scripts/plot_summary.man.in at 1.93 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.91.1.5
    
      scripts/plot_summary.mdoc.in at 1.93 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.91.1.5
    
      scripts/summary-opts at 1.42 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.40.1.5
    
      scripts/summary.1summaryman at 1.93 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.91.1.5
    
      scripts/summary.1summarymdoc at 1.93 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.91.1.5
    
      scripts/summary.html at 1.96 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.94.1.5
    
      scripts/summary.man.in at 1.93 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.91.1.5
    
      scripts/summary.mdoc.in at 1.93 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.91.1.5
    
      sntp/invoke-sntp.texi at 1.480 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.478.1.5
    
      sntp/sntp-opts.c at 1.498 +0 -159
        Use -dev versions of the documentation files.
        MERGE: 1.496.1.6
    
      sntp/sntp-opts.h at 1.497 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.495.1.5
    
      sntp/sntp.1sntpman at 1.315 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.313.1.5
    
      sntp/sntp.1sntpmdoc at 1.315 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.313.1.5
    
      sntp/sntp.html at 1.495 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.493.1.5
    
      sntp/sntp.man.in at 1.315 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.313.1.5
    
      sntp/sntp.mdoc.in at 1.315 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.313.1.5
    
      util/invoke-ntp-keygen.texi at 1.484 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.482.1.5
    
      util/ntp-keygen-opts.c at 1.501 +0 -173
        Use -dev versions of the documentation files.
        MERGE: 1.499.1.6
    
      util/ntp-keygen-opts.h at 1.500 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.498.1.5
    
      util/ntp-keygen.1ntp-keygenman at 1.312 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.312 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      util/ntp-keygen.html at 1.159 +0 -2
        Use -dev versions of the documentation files.
        MERGE: 1.157.1.5
    
      util/ntp-keygen.man.in at 1.312 +0 -3
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
      util/ntp-keygen.mdoc.in at 1.312 +1 -2
        Use -dev versions of the documentation files.
        MERGE: 1.310.1.5
    
    ChangeSet at 1.3269, 2015-01-04 23:13:07+00:00, stenn at psp-fb1.ntp.org
      [Bug 2187] Update version number generation scripts
    
      ChangeLog at 1.1595 +1 -0
        [Bug 2187] Update version number generation scripts
    
      configure.ac at 1.578.1.1 +1 -1
        [Bug 2187] Update version number generation scripts
    
      packageinfo.sh at 1.496 +8 -4
        [Bug 2187] Update version number generation scripts
    
    ChangeSet at 1.3268, 2014-12-19 08:43:40-05:00, stenn at deacon.udel.edu
      ntp4-4.9 begins
    
      ChangeLog at 1.1594 +1 -0
        ntp4-4.9 begins
    
      ntpd/invoke-ntp.conf.texi at 1.169 +1 -1
        ntp4-4.9 begins
    
      ntpd/invoke-ntp.keys.texi at 1.166 +1 -1
        ntp4-4.9 begins
    
      ntpd/invoke-ntpd.texi at 1.482 +2 -2
        ntp4-4.9 begins
    
      ntpd/ntp.conf.5man at 1.203 +3 -3
        ntp4-4.9 begins
    
      ntpd/ntp.conf.5mdoc at 1.203 +1 -1
        ntp4-4.9 begins
    
      ntpd/ntp.conf.html at 1.162 +1 -1
        ntp4-4.9 begins
    
      ntpd/ntp.conf.man.in at 1.203 +3 -3
        ntp4-4.9 begins
    
      ntpd/ntp.conf.mdoc.in at 1.203 +1 -1
        ntp4-4.9 begins
    
      ntpd/ntp.keys.5man at 1.200 +2 -2
        ntp4-4.9 begins
    
      ntpd/ntp.keys.5mdoc at 1.200 +1 -1
        ntp4-4.9 begins
    
      ntpd/ntp.keys.html at 1.163 +1 -1
        ntp4-4.9 begins
    
      ntpd/ntp.keys.man.in at 1.200 +2 -2
        ntp4-4.9 begins
    
      ntpd/ntp.keys.mdoc.in at 1.200 +1 -1
        ntp4-4.9 begins
    
      ntpd/ntpd-opts.c at 1.503 +239 -239
        ntp4-4.9 begins
    
      ntpd/ntpd-opts.h at 1.502 +3 -3
        ntp4-4.9 begins
    
      ntpd/ntpd.1ntpdman at 1.311 +3 -3
        ntp4-4.9 begins
    
      ntpd/ntpd.1ntpdmdoc at 1.311 +1 -1
        ntp4-4.9 begins
    
      ntpd/ntpd.html at 1.157 +2 -2
        ntp4-4.9 begins
    
      ntpd/ntpd.man.in at 1.311 +3 -3
        ntp4-4.9 begins
    
      ntpd/ntpd.mdoc.in at 1.311 +1 -1
        ntp4-4.9 begins
    
      ntpdc/invoke-ntpdc.texi at 1.480 +2 -2
        ntp4-4.9 begins
    
      ntpdc/ntpdc-opts.c at 1.498 +107 -107
        ntp4-4.9 begins
    
      ntpdc/ntpdc-opts.h at 1.497 +3 -3
        ntp4-4.9 begins
    
      ntpdc/ntpdc.1ntpdcman at 1.311 +3 -3
        ntp4-4.9 begins
    
      ntpdc/ntpdc.1ntpdcmdoc at 1.311 +1 -1
        ntp4-4.9 begins
    
      ntpdc/ntpdc.html at 1.324 +2 -2
        ntp4-4.9 begins
    
      ntpdc/ntpdc.man.in at 1.311 +3 -3
        ntp4-4.9 begins
    
      ntpdc/ntpdc.mdoc.in at 1.311 +1 -1
        ntp4-4.9 begins
    
      ntpq/invoke-ntpq.texi at 1.486 +2 -2
        ntp4-4.9 begins
    
      ntpq/ntpq-opts.c at 1.503 +106 -106
        ntp4-4.9 begins
    
      ntpq/ntpq-opts.h at 1.501 +3 -3
        ntp4-4.9 begins
    
      ntpq/ntpq.1ntpqman at 1.314 +3 -3
        ntp4-4.9 begins
    
      ntpq/ntpq.1ntpqmdoc at 1.314 +1 -1
        ntp4-4.9 begins
    
      ntpq/ntpq.html at 1.154 +2 -2
        ntp4-4.9 begins
    
      ntpq/ntpq.man.in at 1.314 +3 -3
        ntp4-4.9 begins
    
      ntpq/ntpq.mdoc.in at 1.314 +1 -1
        ntp4-4.9 begins
    
      ntpsnmpd/invoke-ntpsnmpd.texi at 1.482 +2 -2
        ntp4-4.9 begins
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.500 +68 -68
        ntp4-4.9 begins
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.499 +3 -3
        ntp4-4.9 begins
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdman at 1.311 +3 -3
        ntp4-4.9 begins
    
      ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc at 1.311 +1 -1
        ntp4-4.9 begins
    
      ntpsnmpd/ntpsnmpd.html at 1.152 +1 -1
        ntp4-4.9 begins
    
      ntpsnmpd/ntpsnmpd.man.in at 1.311 +3 -3
        ntp4-4.9 begins
    
      ntpsnmpd/ntpsnmpd.mdoc.in at 1.311 +1 -1
        ntp4-4.9 begins
    
      packageinfo.sh at 1.495 +1 -1
        ntp4-4.9 begins
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjman at 1.73 +3 -3
        ntp4-4.9 begins
    
      scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc at 1.73 +1 -1
        ntp4-4.9 begins
    
      scripts/calc_tickadj/calc_tickadj.html at 1.75 +1 -1
        ntp4-4.9 begins
    
      scripts/calc_tickadj/calc_tickadj.man.in at 1.72 +3 -3
        ntp4-4.9 begins
    
      scripts/calc_tickadj/calc_tickadj.mdoc.in at 1.73 +1 -1
        ntp4-4.9 begins
    
      scripts/calc_tickadj/invoke-calc_tickadj.texi at 1.77 +1 -1
        ntp4-4.9 begins
    
      scripts/invoke-plot_summary.texi at 1.94 +2 -2
        ntp4-4.9 begins
    
      scripts/invoke-summary.texi at 1.94 +2 -2
        ntp4-4.9 begins
    
      scripts/ntp-wait/invoke-ntp-wait.texi at 1.303 +2 -2
        ntp4-4.9 begins
    
      scripts/ntp-wait/ntp-wait-opts at 1.39 +2 -2
        ntp4-4.9 begins
    
      scripts/ntp-wait/ntp-wait.1ntp-waitman at 1.301 +3 -3
        ntp4-4.9 begins
    
      scripts/ntp-wait/ntp-wait.1ntp-waitmdoc at 1.301 +1 -1
        ntp4-4.9 begins
    
      scripts/ntp-wait/ntp-wait.html at 1.320 +2 -2
        ntp4-4.9 begins
    
      scripts/ntp-wait/ntp-wait.man.in at 1.301 +3 -3
        ntp4-4.9 begins
    
      scripts/ntp-wait/ntp-wait.mdoc.in at 1.301 +1 -1
        ntp4-4.9 begins
    
      scripts/ntpsweep/invoke-ntpsweep.texi at 1.92 +2 -2
        ntp4-4.9 begins
    
      scripts/ntpsweep/ntpsweep-opts at 1.41 +2 -2
        ntp4-4.9 begins
    
      scripts/ntpsweep/ntpsweep.1ntpsweepman at 1.80 +3 -3
        ntp4-4.9 begins
    
      scripts/ntpsweep/ntpsweep.1ntpsweepmdoc at 1.80 +1 -1
        ntp4-4.9 begins
    
      scripts/ntpsweep/ntpsweep.html at 1.93 +2 -2
        ntp4-4.9 begins
    
      scripts/ntpsweep/ntpsweep.man.in at 1.80 +3 -3
        ntp4-4.9 begins
    
      scripts/ntpsweep/ntpsweep.mdoc.in at 1.81 +1 -1
        ntp4-4.9 begins
    
      scripts/ntptrace/invoke-ntptrace.texi at 1.92 +2 -2
        ntp4-4.9 begins
    
      scripts/ntptrace/ntptrace-opts at 1.41 +2 -2
        ntp4-4.9 begins
    
      scripts/ntptrace/ntptrace.1ntptraceman at 1.80 +3 -3
        ntp4-4.9 begins
    
      scripts/ntptrace/ntptrace.1ntptracemdoc at 1.80 +1 -1
        ntp4-4.9 begins
    
      scripts/ntptrace/ntptrace.html at 1.93 +2 -2
        ntp4-4.9 begins
    
      scripts/ntptrace/ntptrace.man.in at 1.80 +3 -3
        ntp4-4.9 begins
    
      scripts/ntptrace/ntptrace.mdoc.in at 1.81 +1 -1
        ntp4-4.9 begins
    
      scripts/plot_summary-opts at 1.41 +2 -2
        ntp4-4.9 begins
    
      scripts/plot_summary.1plot_summaryman at 1.92 +3 -3
        ntp4-4.9 begins
    
      scripts/plot_summary.1plot_summarymdoc at 1.92 +1 -1
        ntp4-4.9 begins
    
      scripts/plot_summary.html at 1.95 +2 -2
        ntp4-4.9 begins
    
      scripts/plot_summary.man.in at 1.92 +3 -3
        ntp4-4.9 begins
    
      scripts/plot_summary.mdoc.in at 1.92 +1 -1
        ntp4-4.9 begins
    
      scripts/summary-opts at 1.41 +2 -2
        ntp4-4.9 begins
    
      scripts/summary.1summaryman at 1.92 +3 -3
        ntp4-4.9 begins
    
      scripts/summary.1summarymdoc at 1.92 +1 -1
        ntp4-4.9 begins
    
      scripts/summary.html at 1.95 +2 -2
        ntp4-4.9 begins
    
      scripts/summary.man.in at 1.92 +3 -3
        ntp4-4.9 begins
    
      scripts/summary.mdoc.in at 1.92 +1 -1
        ntp4-4.9 begins
    
      sntp/invoke-sntp.texi at 1.479 +2 -2
        ntp4-4.9 begins
    
      sntp/sntp-opts.c at 1.497 +159 -159
        ntp4-4.9 begins
    
      sntp/sntp-opts.h at 1.496 +3 -3
        ntp4-4.9 begins
    
      sntp/sntp.1sntpman at 1.314 +3 -3
        ntp4-4.9 begins
    
      sntp/sntp.1sntpmdoc at 1.314 +1 -1
        ntp4-4.9 begins
    
      sntp/sntp.html at 1.494 +2 -2
        ntp4-4.9 begins
    
      sntp/sntp.man.in at 1.314 +3 -3
        ntp4-4.9 begins
    
      sntp/sntp.mdoc.in at 1.314 +1 -1
        ntp4-4.9 begins
    
      util/invoke-ntp-keygen.texi at 1.483 +2 -2
        ntp4-4.9 begins
    
      util/ntp-keygen-opts.c at 1.500 +173 -173
        ntp4-4.9 begins
    
      util/ntp-keygen-opts.h at 1.499 +3 -3
        ntp4-4.9 begins
    
      util/ntp-keygen.1ntp-keygenman at 1.311 +3 -3
        ntp4-4.9 begins
    
      util/ntp-keygen.1ntp-keygenmdoc at 1.311 +1 -1
        ntp4-4.9 begins
    
      util/ntp-keygen.html at 1.158 +2 -2
        ntp4-4.9 begins
    
      util/ntp-keygen.man.in at 1.311 +3 -3
        ntp4-4.9 begins
    
      util/ntp-keygen.mdoc.in at 1.311 +1 -1
        ntp4-4.9 begins
    
    ChangeSet at 1.3267, 2014-12-19 08:12:33-05:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3265.1.1
    
      packageinfo.sh at 1.494 +0 -0
        Auto merged
        MERGE: 1.492.1.1
    
    ChangeSet at 1.3266, 2014-12-19 06:52:42-05:00, stenn at deacon.udel.edu
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.3264.1.1
    
      packageinfo.sh at 1.493 +0 -3
        merge cleanup
        MERGE: 1.491.1.1
    
    ChangeSet at 1.3264.1.1, 2014-12-19 06:51:07-05:00, stenn at deacon.udel.edu
      ntp4-4.9
    
      packageinfo.sh at 1.491.1.1 +5 -5
        ntp4-4.9
    


More information about the commitlogs mailing list