From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 10 Nov 2008 03:55:31 +0000 (-0500)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P138~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=784189b7ed08ffc79bf59ea45c5665156827204e;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/murray/shm

bk: 4917b0b3qiu4Us_j6WUM4HwJ_3yUZw
---

784189b7ed08ffc79bf59ea45c5665156827204e
diff --cc ChangeLog
index 1e4938165,e15bf04a3..f5aa50576
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* SHM driver grabs more samples, add clockstats
+ * decode.html and driver20.html updates from Dave Mills.
  (4.2.5p137) 2008/11/01 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1069] #undef netsnmp's PACKAGE_* macros.
  * [Bug 1068] Older versions of netsnmp do not have netsnmp_daemonize().