]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
authorTomasz Flendrich <tflendrich@ntp.org>
Sun, 5 Jul 2015 13:44:55 +0000 (13:44 +0000)
committerTomasz Flendrich <tflendrich@ntp.org>
Sun, 5 Jul 2015 13:44:55 +0000 (13:44 +0000)
into  psp-deb1.ntp.org:/home/tflendrich/codeReview/ntp-stable-unity

bk: 559934d7WvRop-n7pCK9tAXxaoNkdA

1  2 
ChangeLog

diff --cc ChangeLog
index 0d10835ea00c00babd1e1a547fa016c61eda522a,f5a35874be278f00f53ee70e444070775f6c21c2..9451b5df92f142cf5512bce515f3860d5c6c6f2a
+++ 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>