diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-24 19:31:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-24 19:31:45 (GMT) |
| commit | aaa6c8a6cefff2fc8938453f09fb91523b9e87e4 (patch) | |
| tree | fd186e3ee9ba0c4d514baa27d78b8553bcedcb70 /Help/manual/cmake-modules.7.rst | |
| parent | faf291a9c41cc2a4ffa6797c1d35c7863118a4c4 (diff) | |
| parent | d64ee80d6bfb97a63953796074e792f4883e5fb2 (diff) | |
| download | CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.zip CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.gz CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.bz2 | |
Merge branch 'master' into doc-singlehtml
Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help
options from both sides.
Diffstat (limited to 'Help/manual/cmake-modules.7.rst')
| -rw-r--r-- | Help/manual/cmake-modules.7.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index 7a06be6..2bbe622 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -138,6 +138,7 @@ All Modules /module/FindMPEG /module/FindMPI /module/FindOpenAL + /module/FindOpenCL /module/FindOpenGL /module/FindOpenMP /module/FindOpenSceneGraph |