]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 31 Aug 2008 09:00:34 +0000 (05:00 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 31 Aug 2008 09:00:34 +0000 (05:00 -0400)
into  pogo.udel.edu:/pogo/users/gerstung/gsoc/ntp-dev

bk: 48ba5db2_DwJvPufPbMtmu1H_dbuuA

1  2 
ChangeLog
configure.ac

diff --cc ChangeLog
index 900e704d77cc730983aad64f14825ed63734c174,8e12fbaef807e24d0d8d2fec10d6e69a91d1c528..8095241f98310ede8f6f42baa1bf432906d33f9b
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * Prepare for GSoC2008 NTP MIB daemon import.
 +* Stop libtool-1.5 from looking for C++ or Fortran.
  * [BUG 610] Documentation update for NMEA reference clock driver.
  * [Bug 828] Fix IPv4/IPv6 address parsing.
  * Changes from Dave Mills:
diff --cc configure.ac
Simple merge