From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 29 Oct 2009 08:08:52 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e9931ff754f2645ec8f31a9fb3b877d64e8b58a;p=thirdparty%2Fntp.git

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

bk: 4ae94d94q02xgucn3l1ZP9neuvkmfw
---

0e9931ff754f2645ec8f31a9fb3b877d64e8b58a
diff --cc ChangeLog
index 0f7f267546,b5b7e1dc1a..08b19395c8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
- * [Bug 1357] bogus assert from refclock_shm
++* [Bug 1357] bogus assert from refclock_shm.
+ * [Bug 1359] Debug message cleanup.
+ * CID 101: more pointer/array cleanup.
  * [Bug 1356] core dump from refclock_nmea when can't open /dev/gpsU.
  * [Bug 1358] AIX 4.3 sntp/networking.c IPV6_JOIN_GROUP undeclared.
  * CID 101: pointer/array cleanup.