From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 12 Nov 2007 02:07:00 +0000 (-0500)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P97~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9a92e7b054d9aca5c2695d39647b3b76f90e235;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/burnicki/ntp-dev-bug-957

bk: 4737b5447jeDuEzNP-Rm2D1EEDxCpA
---

a9a92e7b054d9aca5c2695d39647b3b76f90e235
diff --cc ChangeLog
index 99ebe90a2,14c138a5f..27b0072af
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 +* [Bug 957] Windows only: Let command line parameters from the Windows SCM GUI
 +  override the standard parameters from the ImagePath registry key.
 +* Added HAVE_INT32_T to the Windows config.h to avoid duplicate definitions.
+ * Work around a VPATH difference in FreeBSD's 'make' command.
  * Update bugreport URL.
  * Update -I documentation.
  * [Bug 713] Fix bug reporting information.