From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 27 Feb 2012 05:28:03 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:../hart/ntp-dev-2048
X-Git-Tag: NTP_4_2_7P261~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bbca935132d9d879fd54b5eeb3bac2a7c111a41;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:../hart/ntp-dev-2048
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4f4b14635JZNF2Zagm21oMSpzrvRmw
---

0bbca935132d9d879fd54b5eeb3bac2a7c111a41
diff --cc ChangeLog
index c2f667d15,c41fbdde7..c9c6b8faa
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 2048] add the clock variable timecode to SHM refclock.
+ (4.2.7p260) 2012/02/24 Released by Harlan Stenn <stenn@ntp.org>
  * Fix the check-scm-rev invocation in several Makefile.am's.
  (4.2.7p259) 2012/02/22 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2148] ntpd 4.2.7p258 segfault with 0x0100000 bit in NMEA mode.