From 52c36c5b956d929cef585ee1482359baf7c7b8cf Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 1 Nov 2007 18:22:33 +0000
Subject: [PATCH] Fix the previous merge commit, it didn't include all the
 changes.

[SVN r40655]
---
 version_history.html | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/version_history.html b/version_history.html
index 5a0e2bb..9fe8759 100644
--- a/version_history.html
+++ b/version_history.html
@@ -1776,15 +1776,11 @@
                       <li>Tests are now run in the context of the user's PATH
                       environment settings</li>
 
-                      <li><a href=
-                      "../tools/build/v1/msvc-stlport-tools.html">msvc-stlport</a>
-                      and <a href=
-                      "../tools/build/v1/intel-win32-tools.html">intel-win32-stlport</a>
+                      <li>msvc-stlport and intel-win32-stlport
                       toolsets now build static libraries with multithreading
                       enabled, to be compatible with the STLPort builds.</li>
 
-                      <li><a href=
-                      "../tools/build/v1/intel-win32-tools.html">intel-win32</a>
+                      <li>intel-win32
                       toolset now handles <code>wchar_t</code> correctly when
                       intel is installed over msvc6.</li>
 
@@ -1804,8 +1800,7 @@
                       "../libs/conversion/lexical_cast.htm">conversion/lexical_cast</a>'s
                       <code>wchar_t</code> fixes from the main trunk.</li>
 
-                      <li><a href=
-                      "../tools/build/v1/intel-linux-tools.html">intel-linux-tools</a>:
+                      <li>intel-linux-tools:
                       added <code>rt</code> to FINDLIBS in order to make the
                       <code>clock_gettime()</code> function available
                       (backport of a patch in CVS HEAD).</li>