From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 14 Apr 2012 03:55:59 +0000 (-0700)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P272~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86ddf9ab397b20bf6515dbaeefdf8339a8ae0620;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  hms-mbp.local:/Users/harlan/src/ntp-dev

bk: 4f88f54fVcjN0WnOTK4n_mZN6wJg7g
---

86ddf9ab397b20bf6515dbaeefdf8339a8ae0620
diff --cc ChangeLog
index df1653b4c,b863142d3..cbf06ccaf
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
 +* LCRYPTO is gone - replace with VER_SUFFIX.
+ * Change the link order for ntpsntpd.
+ * Remove extra 'nlist' check from configure.ac.
  (4.2.7p271) 2012/04/11 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1122] openssl detection via pkg-config fails when no additional
    -Idir flags are needed.