diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-27 10:14:38 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-27 10:14:38 (GMT) |
| commit | f4517a4767560d7822885443434eb185612a6817 (patch) | |
| tree | 1acaa4f42ea3bc5b479f222b98e2146f317bd8cf /Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst | |
| parent | 4d0f040aa4bf236d5f677e1f5f0798cb79e8d8cf (diff) | |
| parent | d70ef7eff658003c35e5a75d43dc06a31c0cc986 (diff) | |
| download | CMake-f4517a4767560d7822885443434eb185612a6817.zip CMake-f4517a4767560d7822885443434eb185612a6817.tar.gz CMake-f4517a4767560d7822885443434eb185612a6817.tar.bz2 | |
Merge branch 'release-3.9'
Use the "ours" merge strategy because we're merging a fixup that is
specific to the 3.9 branch and do not need the changes in `master`.
Diffstat (limited to 'Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst')
0 files changed, 0 insertions, 0 deletions