From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 19 Jun 2011 23:11:33 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db59295fb9c44aaa6dbf271e97456dc70ed37f58;p=thirdparty%2Fntp.git

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

bk: 4dfe8225aoXKEeD7yXMHEc3EF0uUYw
---

db59295fb9c44aaa6dbf271e97456dc70ed37f58
diff --cc ChangeLog
index 9485397d3a,2f45721add..5bfc72fb92
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
+ * Add the man page tag "flavor" to the loc.* files.
+ * Add/distribute genLocInfo.
 +(4.2.7p183) 2011/06/19 Released by Harlan Stenn <stenn@ntp.org>
 +* Update the autogen include list for scripts/Makefile.am.
  * Added loc.freebsd (and distribute it).
  * Added loc.legacy (and distribute it).
  (4.2.7p182) 2011/06/15 Released by Harlan Stenn <stenn@ntp.org>