merged fusion from the trunk (3)

[SVN r63757]
This commit is contained in:
Christopher Schmidt committed 2010-07-08 18:32:12 +00:00
1 parent 0f4ac2e9e3
commit 199d8b548f
247 files changed
+1391 -1391

No files matched your search

+2 -2
View File
@@ -34,7 +34,7 @@
<div><p class="copyright">Copyright &#169; 2001-2007 Joel de Guzman, Dan Marsden, Tobias
Schwinger</p></div>
<div><div class="legalnotice">
<a name="id759727"></a><p>
<a name="id863531"></a><p>
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
</p>
@@ -257,7 +257,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"><p><small>Last revised: July 07, 2010 at 20:51:04 GMT</small></p></td>
<td align="left"><p><small>Last revised: July 08, 2010 at 17:09:26 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>