Fix conflict and correct boost libraries hyperlink

[SVN r7857]
This commit is contained in:
Beman Dawes 2000-09-27 19:31:09 +00:00
parent 3aa7b71ef2
commit 3a20dbe547

@ -1 +1 @@
Subproject commit c9cfe5a90647dc5a007ab98a86f71488df609d36
Subproject commit 8a5e8b8c62fef4c44ea066ca9b6d6c38109fb836