Fusion: merge from trunk

[SVN r67492]
This commit is contained in:
Christopher Schmidt
2010-12-29 19:54:59 +00:00
parent 7aa4e2cbda
commit cd811f56bc
264 changed files with 1488 additions and 1466 deletions

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="id830146"></a><p>
<a name="id785793"></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>
@ -261,7 +261,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: October 10, 2010 at 20:13:53 GMT</small></p></td>
<td align="left"><p><small>Last revised: December 19, 2010 at 15:00:31 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>