From: Dave Hart <hart@ntp.org>
Date: Tue, 7 Apr 2009 18:08:42 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:c:\ntp\ntp-dev-1148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98d14c3477e92fe0c81e997f37e594d06facd33e;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:c:\ntp\ntp-dev-1148
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-gone-dot-o-216-1148-1149

bk: 49db96aaVEpApxtaaYMMu-59uqQpmQ
---

98d14c3477e92fe0c81e997f37e594d06facd33e
diff --cc ChangeLog
index 9fb7093b46,d9dad777fa..b6ed9313ae
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
 +* [Bug 1148] NMEA reference clock improvements
+ * remove deleted gsoc_sntp/utilities.o from repository so that .o build
+   products can be cleaned up without corrupting the repository.
+ (4.2.5p161) 2009/03/31 Released by Harlan Stenn <stenn@ntp.org>
  * Documentation updates from Dave Mills.
  (4.2.5p160) 2009/03/30 Released by Harlan Stenn <stenn@ntp.org>
  * Include (4.2.4p7)