diff options
author | Brad King <brad.king@kitware.com> | 2015-09-22 17:57:08 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-09-22 17:57:08 (GMT) |
commit | 2e6063068c94d4045e699fed51e6d1e9af344bbf (patch) | |
tree | d11025f71134b3238e52655640dcdf2158425597 /Tests/CTestTestEmptyBinaryDirectory | |
parent | 81739e9215ef10d870f14404b0ec5eb4bee16ce4 (diff) | |
parent | 3bb707f0a1408dc0381ecbf4ec934e9f14d8927c (diff) | |
download | CMake-2e6063068c94d4045e699fed51e6d1e9af344bbf.zip CMake-2e6063068c94d4045e699fed51e6d1e9af344bbf.tar.gz CMake-2e6063068c94d4045e699fed51e6d1e9af344bbf.tar.bz2 |
Merge branch 'improve-variable-help-formatting' into revert-cmake-W-options
Resolve conflicts in
Help/variable/CMAKE_ERROR_DEPRECATED.rst
Help/variable/CMAKE_WARN_DEPRECATED.rst
by integrating changes from both sides.
Diffstat (limited to 'Tests/CTestTestEmptyBinaryDirectory')
0 files changed, 0 insertions, 0 deletions