Merged upstream changes

1 files changed, 6 insertions, 0 deletions

diff --git a/libs/libraries.htm b/libs/libraries.htm
index 01807d78ed..ca5c9ccb03 100644
--- a/libs/libraries.htm
+++ b/libs/libraries.htm
@@ -175,6 +175,9 @@ how to download, build, and install the libraries.</p>
     <li><a href="graph/doc/table_of_contents.html">graph</a> -
         Generic graph components and algorithms, from Jeremy Siek
         and a University of Notre Dame team; now maintained by Andrew Sutton and Jeremiah Willcock.</li>
+    <li><a href="hana/doc/html/index.html">hana</a> (C++14) - Heterogeneous sequences
+    and algorithms, type-level computations and other metaprogramming tools,
+    from Louis Dionne</li>
     <li><a href="heap/index.html">heap</a> -
         Priority queue data structures, from Tim Blechmann</li>
     <li><a href="icl/index.html">icl</a> -
@@ -788,6 +791,9 @@ of arbitrary data for persistence and marshalling, from Robert Ramey</li>
     <li><a href="fusion/index.html">fusion</a> -
         Library for working with tuples, including various containers,
     algorithms, etc. From Joel de Guzman, Dan Marsden and Tobias Schwinger.</li>
+    <li><a href="hana/doc/html/index.html">hana</a> (C++14) - Heterogeneous sequences
+    and algorithms, type-level computations and other metaprogramming tools,
+    from Louis Dionne</li>
     <li><a href="mpl/doc/index.html">mpl</a> - Template metaprogramming
     framework of compile-time algorithms, sequences and metafunction classes,
     from Aleksey Gurtovoy.</li>