From: Tomasz Flendrich <tflendrich@ntp.org>
Date: Sun, 5 Jul 2015 13:44:55 +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=a27980259d8f831c3be1b125bdc3fc67b7f821db;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: 559934d7WvRop-n7pCK9tAXxaoNkdA
---

a27980259d8f831c3be1b125bdc3fc67b7f821db
diff --cc ChangeLog
index 0d10835ea,f5a35874b..9451b5df9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -22,6 -20,8 +20,9 @@@
    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>