summaryrefslogtreecommitdiff
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-12 10:29:36 -0400
committerBrad King <brad.king@kitware.com>2015-10-12 10:29:36 -0400
commit4df5c3d13163eaaadd1062f1fc45a3177972b21b (patch)
treedaecf6664103b0229ce398fcc50ae0bf6f824f70 /Help
parent889d90de4421d721877d48e44de303db56562af4 (diff)
parent340d0897fa9dfc568782d72c221ea6186bf533a6 (diff)
downloadcmake-4df5c3d13163eaaadd1062f1fc45a3177972b21b.tar.gz
Merge branch 'revert-compiler-features-solaris' into release
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-compile-features.7.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/manual/cmake-compile-features.7.rst b/Help/manual/cmake-compile-features.7.rst
index 2dc67bcf97..caf5bac2a8 100644
--- a/Help/manual/cmake-compile-features.7.rst
+++ b/Help/manual/cmake-compile-features.7.rst
@@ -308,4 +308,4 @@ versions specified for each:
* ``Clang``: Clang compiler versions 2.9 through 3.4.
* ``GNU``: GNU compiler versions 4.4 through 5.0.
* ``MSVC``: Microsoft Visual Studio versions 2010 through 2015.
-* ``SunPro``: Oracle SolarisStudio version 12.4 on a Linux host.
+* ``SunPro``: Oracle SolarisStudio version 12.4.