From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 19 Nov 2012 07:10:16 +0000 (-0500)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P324~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0934409256fbd47e45b07e75c09c1cfea6a8c16b;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  psp-deb1.ntp.org:/home/perlinger/ntp-dev-2306

bk: 50a9db58Xb8QZC-2WawyjAUZ7ZKTfg
---

0934409256fbd47e45b07e75c09c1cfea6a8c16b
diff --cc ChangeLog
index 1024675d9,a2f019a4b..ae0e37ad3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,5 +1,9 @@@
 +* Reinstate doc fix to authentic.html from Mike T.
 +* [Bug 1223] cleanup for rlimit changes.
+ * [Bug 2306] Added user-mode/loop-back PPS API provider for Win32
 +(4.2.7p323) 2012/11/18 Released by Harlan Stenn <stenn@ntp.org>
  * html/ updates from Dave Mills.
 +(4.2.7p322) 2012/11/15 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1223] Allow configurable values for RLIMIT_STACK and
    RLIMIT_MEMLOCK.
  * [Bug 1320] Log ntpd's initial command-line parameters. (updated fix)