From: Tomasz Flendrich <tflendrich@ntp.org>
Date: Sat, 4 Jul 2015 23:00:54 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0dc3cf2d92ca5b2615d195de01329089785daa8;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
into  psp-deb1.ntp.org:/home/tflendrich/codeReview/ntp-stable-unity

bk: 559865a6q3yUBXyC8L77YHvOn95ShA
---

c0dc3cf2d92ca5b2615d195de01329089785daa8
diff --cc ChangeLog
index 981954dfc,a206de4e6..f5a35874b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -16,11 -16,8 +16,12 @@@
  * sntp/unity/unity_internals.h: handle *INTPTR_MAX on old Solaris.  H.Stenn.
  * tests/libntp/timevalops.c and timespecops.c fixd error printing.  D.Tomić.
  * tests/libntp/ improvements in code and fixed error printing.  Damir Tomić.
 +* tests/libntp: a_md5encrypt.c, authkeys.c, buftvtots.c, calendar.c, caljulian.c,
 +  caltontp.c, clocktime.c, humandate.c, hextolfp.c, decodenetnum.c - fixed
 +  formatting; first declaration, then code (C90); deleted unnecessary comments;
 +  changed from sprintf to snprintf; fixed order of includes. Tomasz Flendrich
- * sntp/unity/Makefile.am added a missing header. Tomasz Flendrich
+ * sntp/unity/unity_config.h: Distribute it.  Harlan Stenn.
+ * sntp/libevent/evconfig-private.h: remove generated filefrom SCM.  H.Stenn.
  ---
  (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>