diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-11-14 10:04:30 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-11-14 10:04:30 +0000 |
commit | 7b64e122ccda2f592a1a20c339318880302a92ed (patch) | |
tree | 610c9fc09c688ab58e481312743acb3cf6d233d9 /src/common/doc | |
parent | 4e4b190e9f3937f3f136c83e42c3c9322074f16a (diff) | |
parent | d121955a744c87e6b4ebbe42b42fb2321a32e9e3 (diff) |
Merge last trunk modifications and resolve conflict on src/Alpha_complex/utilities/alphacomplex.md
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alpha_complex_3d_module_vincent@3979 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2a63709432810154d7939e9bdd74f9d55d0aee43
Diffstat (limited to 'src/common/doc')
-rw-r--r-- | src/common/doc/installation.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/doc/installation.h b/src/common/doc/installation.h index ab54cbc7..8fb8b330 100644 --- a/src/common/doc/installation.h +++ b/src/common/doc/installation.h @@ -5,7 +5,7 @@ * Examples of GUDHI headers inclusion can be found in \ref utilities. * * \section compiling Compiling - * The library uses c++11 and requires <a target="_blank" href="http://www.boost.org/">Boost</a> ≥ 1.48.0 + * The library uses c++11 and requires <a target="_blank" href="http://www.boost.org/">Boost</a> ≥ 1.56.0 * and <a target="_blank" href="https://www.cmake.org/">CMake</a> ≥ 3.1. * It is a multi-platform library and compiles on Linux, Mac OSX and Visual Studio 2015. * @@ -18,7 +18,7 @@ cmake .. make \endverbatim * By default, examples are disabled. You can activate their compilation with * <a href="https://cmake.org/cmake/help/v3.0/manual/ccmake.1.html">ccmake</a> (on Linux and Mac OSX), - * <a href="https://cmake.org/cmake/help/v3.0/manual/cmake-gui.1.html">cmake-gui</a> (on Windows) or y mofifying the + * <a href="https://cmake.org/cmake/help/v3.0/manual/cmake-gui.1.html">cmake-gui</a> (on Windows) or by modifying the * cmake command as follows : \verbatim cmake -DWITH_GUDHI_EXAMPLE=ON .. make \endverbatim |