diff options
author | Rene Rivera <grafikrobot@gmail.com> | 2015-08-05 10:20:35 -0500 |
---|---|---|
committer | Rene Rivera <grafikrobot@gmail.com> | 2015-08-05 10:20:35 -0500 |
commit | 51e693134f5c354f2694fe89d14421c85bfacf31 (patch) | |
tree | 172b3073b9a46cb6448e55c9a43291c15d67d1df /doc | |
parent | c3864a80359bbdfc359193fe09f9c6c96a26692d (diff) | |
download | boost-51e693134f5c354f2694fe89d14421c85bfacf31.tar.gz |
Merge outstanding develop changes (as appropriate).
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/boost.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/boost.xml b/doc/src/boost.xml index effced045a..9474ac1362 100644 --- a/doc/src/boost.xml +++ b/doc/src/boost.xml @@ -56,6 +56,7 @@ <xi:include href="lexical_cast.xml"/> <xi:include href="lockfree.xml"/> <xi:include href="move.xml"/> + <xi:include href="../../libs/multi_array/doc/xml/bbref.xml"/> <xi:include href="mpi.xml"/> <xi:include href="../../libs/program_options/doc/program_options.xml"/> <xi:include href="property_tree.xml"/> |