From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 8 Sep 2008 08:00:25 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P128~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8c9a59a996d8e33bd1075f95624ae214705f58d;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/gerstung/gsoc/ntp-dev

bk: 48c4db99jjB9bER_poknnWysT2Cdkw
---

a8c9a59a996d8e33bd1075f95624ae214705f58d
diff --cc ChangeLog
index 8b49c8f95,a9b8c7f3e..4038f7429
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
 +* Import Heiko Gerstung's GSoC2008 NTP MIB daemon.
  (4.2.5p127) 2008/09/01 Released by Harlan Stenn <stenn@ntp.org>
+ * Regenerate ntpd/ntp_parser.c
  (4.2.5p126) 2008/08/31 Released by Harlan Stenn <stenn@ntp.org>
  * Stop libtool-1.5 from looking for C++ or Fortran.
  * [BUG 610] Documentation update for NMEA reference clock driver.